corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
MozReview-Commit-ID: LQ91rgrJIy
This commit is contained in:
Adrian Wielgosik
2018-05-11 19:46:15 +02:00
parent 64ffaba060
commit aec4ed967e
7 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
accessible/base/DocManager.cpp
View File

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

1
accessible/generic/ApplicationAccessible.cpp
View File

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

1
accessible/generic/DocAccessible.cpp
View File

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

1
accessible/generic/RootAccessible.cpp
View File

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

7
accessible/interfaces/nsIAccessibleDocument.idl
View File

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

5
accessible/xpcom/xpcAccessibleDocument.cpp
View File

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

2
accessible/xpcom/xpcAccessibleDocument.h
View File

@@ -38,7 +38,7 @@ public:
NS_IMETHOD GetTitle(nsAString& aTitle) final; NS_IMETHOD GetTitle(nsAString& aTitle) final;
NS_IMETHOD GetMimeType(nsAString& aType) final; NS_IMETHOD GetMimeType(nsAString& aType) final;
NS_IMETHOD GetDocType(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 GetWindow(mozIDOMWindowProxy** aDOMWindow) final;
NS_IMETHOD GetParentDocument(nsIAccessibleDocument** aDocument) NS_IMETHOD GetParentDocument(nsIAccessibleDocument** aDocument)
final; final;