Bug 1460940 - Remove nsIDOMDocument uses in accessible/. r=bz

MozReview-Commit-ID: LQ91rgrJIy

--HG--
extra : rebase_source : 143e2a3b8971aa1a4e604414c704d28deb1e5594

accessible/base/DocManager.cpp

@@ -26,7 +26,6 @@
 #include "nsCURILoader.h"
 #include "nsDocShellLoadTypes.h"
 #include "nsIChannel.h"
-#include "nsIDOMDocument.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIWebNavigation.h"
 #include "nsServiceManagerUtils.h"

accessible/generic/ApplicationAccessible.cpp

@@ -14,7 +14,6 @@
 #include "States.h"
 
 #include "nsIComponentManager.h"
-#include "nsIDOMDocument.h"
 #include "nsIWindowMediator.h"
 #include "nsServiceManagerUtils.h"
 #include "mozilla/Services.h"

accessible/generic/DocAccessible.cpp

@@ -23,7 +23,6 @@
 #include "nsICommandManager.h"
 #include "nsIDocShell.h"
 #include "nsIDocument.h"
-#include "nsIDOMDocument.h"
 #include "nsPIDOMWindow.h"
 #include "nsIEditingSession.h"
 #include "nsIFrame.h"

accessible/generic/RootAccessible.cpp

@@ -8,7 +8,6 @@
 #include "mozilla/ArrayUtils.h"
 
 #define CreateEvent CreateEventA
-#include "nsIDOMDocument.h"
 
 #include "Accessible-inl.h"
 #include "DocAccessible-inl.h"

accessible/interfaces/nsIAccessibleDocument.idl

@@ -6,9 +6,10 @@
 #include "nsISupports.idl"
 
 interface nsIAccessiblePivot;
-interface nsIDOMDocument;
 interface mozIDOMWindowProxy;
 
+webidl Document;
+
 /**
  * An interface for in-process accessibility clients
  * that wish to retrieve information about a document.
@@ -43,9 +44,9 @@ interface nsIAccessibleDocument : nsISupports
   readonly attribute AString docType;
 
   /**
-   * The nsIDOMDocument interface associated with this document.
+   * The Document interface associated with this document.
    */
-  readonly attribute nsIDOMDocument DOMDocument;
+  readonly attribute Document DOMDocument;
 
   /**
    * The nsIDOMWindow that the document resides in.

accessible/xpcom/xpcAccessibleDocument.cpp

@@ -11,7 +11,6 @@
 
 #include "mozilla/a11y/DocAccessibleParent.h"
 #include "DocAccessible-inl.h"
-#include "nsIDOMDocument.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;
@@ -86,7 +85,7 @@ xpcAccessibleDocument::GetDocType(nsAString& aType)
 }
 
 NS_IMETHODIMP
-xpcAccessibleDocument::GetDOMDocument(nsIDOMDocument** aDOMDocument)
+xpcAccessibleDocument::GetDOMDocument(nsIDocument** aDOMDocument)
 {
   NS_ENSURE_ARG_POINTER(aDOMDocument);
   *aDOMDocument = nullptr;
@@ -95,7 +94,7 @@ xpcAccessibleDocument::GetDOMDocument(nsIDOMDocument** aDOMDocument)
     return NS_ERROR_FAILURE;
 
   if (Intl()->DocumentNode())
-    CallQueryInterface(Intl()->DocumentNode(), aDOMDocument);
+    NS_ADDREF(*aDOMDocument = Intl()->DocumentNode());
 
   return NS_OK;
 }

accessible/xpcom/xpcAccessibleDocument.h

@@ -38,7 +38,7 @@ public:
   NS_IMETHOD GetTitle(nsAString& aTitle) final;
   NS_IMETHOD GetMimeType(nsAString& aType) final;
   NS_IMETHOD GetDocType(nsAString& aType) final;
-  NS_IMETHOD GetDOMDocument(nsIDOMDocument** aDOMDocument) final;
+  NS_IMETHOD GetDOMDocument(nsIDocument** aDOMDocument) final;
   NS_IMETHOD GetWindow(mozIDOMWindowProxy** aDOMWindow) final;
   NS_IMETHOD GetParentDocument(nsIAccessibleDocument** aDocument)
     final;