Bug 1460735 part 2. Remove nsIDOMDocument. r=qdot

Brli · May 29, 2018 · aecc401 · aecc401
1 parent 2c0c1f8
commit aecc401
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 41 deletions.
diff --git a/accessible/interfaces/msaa/ISimpleDOMNode.idl b/accessible/interfaces/msaa/ISimpleDOMNode.idl
@@ -42,7 +42,7 @@ cpp_quote("//")
 cpp_quote("// computedStyle(  ")
 cpp_quote("//  /* [in]  */ unsigned short maxStyleProperties,")
 cpp_quote("//  /* [out] */ unsigned short *numStyleProperties, ")
-cpp_quote("//  /* [in]  */ boolean useAlternateView,  // If TRUE, returns properites for media as set in nsIDOMDocument::set_alternateViewMediaTypes")
+cpp_quote("//  /* [in]  */ boolean useAlternateView,  // If TRUE, returns properites for media as set in Document's set_alternateViewMediaTypes")
 cpp_quote("//  /* [out] */ BSTR *styleProperties, ")
 cpp_quote("//  /* [out] */ BSTR *styleValues);")
 cpp_quote("// ---------------------------------------------------------------------------------------------------=")
@@ -52,7 +52,7 @@ cpp_quote("//  useAlternateView=TRUE: properties for media types set w/ nsIDOMSi
 cpp_quote("//")
 cpp_quote("// computedStyleForProperties(  ")
 cpp_quote("//  /* [in] */  unsigned short numStyleProperties, ")
-cpp_quote("//  /* [in] */  boolean useAlternateView,  // If TRUE, returns properites for media as set in nsIDOMDocument::set_alternateViewMediaTypes")
+cpp_quote("//  /* [in] */  boolean useAlternateView,  // If TRUE, returns properites for media as set in Document's set_alternateViewMediaTypes")
 cpp_quote("//  /* [in] */  BSTR *styleProperties, ")
 cpp_quote("//  /* [out] */ BSTR *styleValues);")
 cpp_quote("// ---------------------------------------------------------------------------------------------------=")
@@ -141,15 +141,15 @@ interface ISimpleDOMNode : IUnknown
 
   [propget] HRESULT computedStyle(  
     [in] unsigned short maxStyleProperties,
-    [in] boolean useAlternateView,  // If TRUE, returns properites for media as set in nsIDOMDocument::set_alternateViewMediaTypes
+    [in] boolean useAlternateView,  // If TRUE, returns properites for media as set in Document's set_alternateViewMediaTypes
     [out, size_is(maxStyleProperties), length_is(*numStyleProperties)] BSTR *styleProperties, 
     [out, size_is(maxStyleProperties), length_is(*numStyleProperties)] BSTR *styleValues,
     [out, retval] unsigned short *numStyleProperties
   );
 
   [propget] HRESULT computedStyleForProperties(  
     [in] unsigned short numStyleProperties, 
-    [in] boolean useAlternateView,  // If TRUE, returns properites for media as set in nsIDOMDocument::set_alternateViewMediaTypes
+    [in] boolean useAlternateView,  // If TRUE, returns properites for media as set in Document's set_alternateViewMediaTypes
     [in, size_is(numStyleProperties), length_is(numStyleProperties)] BSTR *styleProperties, 
     [out, retval, size_is(numStyleProperties), length_is(numStyleProperties)] BSTR *styleValues
   );

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
@@ -81,7 +81,6 @@
 #include "nsIDocShellTreeOwner.h"
 #include "nsIDocument.h"
 #include "nsIDocumentLoaderFactory.h"
-#include "nsIDOMDocument.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMStorage.h"
 #include "nsIDOMWindow.h"
@@ -552,12 +551,6 @@ nsDocShell::GetInterface(const nsIID& aIID, void** aSink)
               aIID.Equals(NS_GET_IID(nsIDOMWindow))) &&
              NS_SUCCEEDED(EnsureScriptEnvironment())) {
     return mScriptGlobal->QueryInterface(aIID, aSink);
-  } else if (aIID.Equals(NS_GET_IID(nsIDOMDocument)) &&
-             NS_SUCCEEDED(EnsureContentViewer())) {
-    nsCOMPtr<nsIDOMDocument> doc =
-      do_QueryInterface(mContentViewer->GetDocument());
-    doc.forget(aSink);
-    return *aSink ? NS_OK : NS_NOINTERFACE;
   } else if (aIID.Equals(NS_GET_IID(nsIDocument)) &&
              NS_SUCCEEDED(EnsureContentViewer())) {
     nsCOMPtr<nsIDocument> doc = mContentViewer->GetDocument();

diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp
@@ -1730,7 +1730,6 @@ NS_INTERFACE_TABLE_HEAD(nsDocument)
     NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(nsDocument, nsISupports, nsINode)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, nsINode)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDocument)
-    NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDOMDocument)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDOMNode)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIScriptObjectPrincipal)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, mozilla::dom::EventTarget)

diff --git a/dom/base/nsDocument.h b/dom/base/nsDocument.h
@@ -21,7 +21,7 @@
 #include "nsWeakPtr.h"
 #include "nsTArray.h"
 #include "nsIdentifierMapEntry.h"
-#include "nsIDOMDocument.h"
+#include "nsIDOMNode.h"
 #include "nsStubDocumentObserver.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIContent.h"
@@ -130,7 +130,7 @@ class nsOnloadBlocker final : public nsIRequest
 
 // Base class for our document implementations.
 class nsDocument : public nsIDocument,
-                   public nsIDOMDocument,
+                   public nsIDOMNode,
                    public nsSupportsWeakReference,
                    public nsIScriptObjectPrincipal,
                    public nsIRadioGroupContainer,

diff --git a/dom/interfaces/base/domstubs.idl b/dom/interfaces/base/domstubs.idl
@@ -16,7 +16,6 @@ typedef double DOMHighResTimeStamp;
 typedef unsigned long long nsViewID;
 
 // Core
-interface nsIDOMDocument;
 interface nsIDOMNode;
 
 // Needed for raises() in our IDL

diff --git a/dom/interfaces/core/moz.build b/dom/interfaces/core/moz.build
@@ -8,7 +8,6 @@ with Files("**"):
     BUG_COMPONENT = ("Core", "DOM")
 
 XPIDL_SOURCES += [
-    'nsIDOMDocument.idl',
     'nsIDOMNode.idl',
     'nsIDOMNSEditableElement.idl',
 ]

diff --git a/dom/interfaces/core/nsIDOMDocument.idl b/dom/interfaces/core/nsIDOMDocument.idl
diff --git a/dom/webidl/Document.webidl b/dom/webidl/Document.webidl
@@ -349,7 +349,7 @@ partial interface Document {
   [Throws, Func="IsChromeOrXBL", NeedsSubjectPrincipal]
   void loadBindingDocument(DOMString documentURL);
 
-  // nsIDOMDocumentTouch
+  // Touch bits
   // XXXbz I can't find the sane spec for this stuff, so just cribbing
   // from our xpidl for now.
   [NewObject, Func="nsGenericHTMLElement::TouchEventsEnabled"]