Bug 543033 - Remove unused getAccessibleInWindow (in nsIAccessibleRetrieval). r=surkov
authorDavid Bolter <dbolter@mozilla.com>
Mon, 01 Feb 2010 21:27:24 -0500
changeset 37807 70da16e4c483b4e5bd0de5cef6994e0c90b93371
parent 37806 5c6c408875848ec16ca98a44cb298c11c2e37478
child 37808 fb6bebbcf7f3bf781c58ac3afa7abc57210a4c83
push id11445
push userdbolter@mozilla.com
push dateTue, 02 Feb 2010 02:31:25 +0000
treeherdermozilla-central@b8635ef804f7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssurkov
bugs543033
milestone1.9.3a1pre
Bug 543033 - Remove unused getAccessibleInWindow (in nsIAccessibleRetrieval). r=surkov
accessible/public/nsIAccessibleRetrieval.idl
accessible/src/base/nsAccessibilityService.cpp
--- a/accessible/public/nsIAccessibleRetrieval.idl
+++ b/accessible/public/nsIAccessibleRetrieval.idl
@@ -88,26 +88,16 @@ interface nsIAccessibleRetrieval : nsISu
    *
    * @param aNode - the DOM node to get relevant content node.
    *
    * @return - the DOM node for parent attached accessible
    */
   nsIDOMNode getRelevantContentNodeFor(in nsIDOMNode aNode);
 
   /**
-   * Return an nsIAccessible for a DOM node in pres shell for this DOM window.
-   * Create a new accessible of the appropriate type if necessary,
-   * or use one from the accessibility cache if it already exists.
-   * @param aNode   The DOM node to get an accessible for.
-   * @param aDOMWin The DOM window containing the node.
-   * @return The nsIAccessible for the given DOM node.
-   */
-  nsIAccessible getAccessibleInWindow(in nsIDOMNode aNode, in nsIDOMWindow aDOMWin);
-
-  /**
    * Return an nsIAccessible for a DOM node in the given weak shell.
    * Create a new accessible of the appropriate type if necessary,
    * or use one from the accessibility cache if it already exists.
    * @param aNode      The DOM node to get an accessible for.
    * @param aPresShell The presentation shell which contains layout info for the DOM node.
    * @return The nsIAccessible for the given DOM node.
    */
   nsIAccessible getAccessibleInWeakShell(in nsIDOMNode aNode, in nsIWeakReference aPresShell);
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -1168,36 +1168,16 @@ nsAccessibilityService::GetAttachedAcces
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (relevantNode != aNode)
     return NS_OK;
 
   return GetAccessibleFor(aNode, aAccessible);
 }
 
-NS_IMETHODIMP nsAccessibilityService::GetAccessibleInWindow(nsIDOMNode *aNode, 
-                                                            nsIDOMWindow *aWin,
-                                                            nsIAccessible **aAccessible)
-{
-  NS_ENSURE_ARG_POINTER(aAccessible);
-  *aAccessible = nsnull;
-
-  NS_ENSURE_ARG(aNode);
-  NS_ENSURE_ARG(aWin);
-
-  nsCOMPtr<nsIWebNavigation> webNav(do_GetInterface(aWin));
-  nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(webNav));
-  if (!docShell)
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsIPresShell> presShell;
-  docShell->GetPresShell(getter_AddRefs(presShell));
-  return GetAccessibleInShell(aNode, presShell, aAccessible);
-}
-
 NS_IMETHODIMP nsAccessibilityService::GetAccessibleInShell(nsIDOMNode *aNode, 
                                                            nsIPresShell *aPresShell,
                                                            nsIAccessible **aAccessible) 
 {
   NS_ENSURE_ARG_POINTER(aAccessible);
   *aAccessible = nsnull;
 
   NS_ENSURE_ARG(aNode);