Bug 561748 - rename nsIAccessibleDocument::document to DOMDocument, r=davidb

accessible/public/nsIAccessibleDocument.idl

@@ -58,7 +58,7 @@ interface nsIDOMWindow;
  *
  * @status UNDER_REVIEW
  */
-[scriptable, uuid(427597a3-1737-4743-bf43-2311a1ed5fbd)]
+[scriptable, uuid(471909e7-0ea4-4ce0-bf31-a1372b2b285c)]
 interface nsIAccessibleDocument : nsISupports
 {
   /**
@@ -84,7 +84,7 @@ interface nsIAccessibleDocument : nsISupports
   /**
    * The nsIDOMDocument interface associated with this document.
    */
-  readonly attribute nsIDOMDocument document;
+  readonly attribute nsIDOMDocument DOMDocument;
 
   /**
    * The nsIDOMWindow that the document resides in.

accessible/src/base/nsDocAccessible.cpp

@@ -474,17 +474,16 @@ NS_IMETHODIMP nsDocAccessible::GetWindow(nsIDOMWindow **aDOMWin)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsDocAccessible::GetDocument(nsIDOMDocument **aDOMDoc)
+NS_IMETHODIMP
+nsDocAccessible::GetDOMDocument(nsIDOMDocument **aDOMDocument)
 {
-  nsCOMPtr<nsIDOMDocument> domDoc(do_QueryInterface(mDocument));
-  *aDOMDoc = domDoc;
+  NS_ENSURE_ARG_POINTER(aDOMDocument);
+  *aDOMDocument = nsnull;
 
-  if (domDoc) {
-    NS_ADDREF(*aDOMDoc);
-    return NS_OK;
-  }
+  if (mDocument)
+    CallQueryInterface(mDocument, aDOMDocument);
 
-  return NS_ERROR_FAILURE;
+  return NS_OK;
 }
 
 // nsIAccessibleHyperText method