Bug 726507 - Replace GetAccService()->GetAccessible() with mDoc->GetAccessible() in html/ and xul/ subfolders of accessibility/src/ folder, r=surkov

accessible/src/html/nsHTMLSelectAccessible.cpp

@@ -431,16 +431,16 @@ nsHTMLSelectOptionAccessible::GetSelectState(PRUint64* aState)
 {
   *aState = 0;
 
-  nsIContent *content = mContent;
+  nsIContent* selectNode = mContent;
-  while (content && content->Tag() != nsGkAtoms::select) {
+  while (selectNode && selectNode->Tag() != nsGkAtoms::select) {
-    content = content->GetParent();
+    selectNode = selectNode->GetParent();
   }
 
-  if (content) {
+  if (selectNode) {
-    nsAccessible* selAcc = GetAccService()->GetAccessible(content, nsnull);
+    nsAccessible* select = mDoc->GetAccessible(selectNode);
-    if (selAcc) {
+    if (select) {
-      *aState = selAcc->State();
+      *aState = select->State();
-      return content;
+      return selectNode;
     }
   }
   return nsnull; 

accessible/src/xul/nsXULListboxAccessible.cpp

@@ -887,7 +887,7 @@ nsXULListboxAccessible::ContainerWidget() const
         nsCOMPtr<nsINode> inputNode = do_QueryInterface(inputElm);
         if (inputNode) {
           nsAccessible* input = 
-            GetAccService()->GetAccessible(inputNode, nsnull);
+            mDoc->GetAccessible(inputNode);
           return input ? input->ContainerWidget() : nsnull;
         }
       }

accessible/src/xul/nsXULMenuAccessible.cpp

@@ -647,7 +647,7 @@ nsXULMenubarAccessible::CurrentItem()
     nsMenuFrame* menuFrame = menuBarFrame->GetCurrentMenuItem();
     if (menuFrame) {
       nsIContent* menuItemNode = menuFrame->GetContent();
-      return GetAccService()->GetAccessible(menuItemNode, nsnull);
+      return mDoc->GetAccessible(menuItemNode);
     }
   }
   return nsnull;

accessible/src/xul/nsXULTreeAccessible.cpp

@@ -517,7 +517,7 @@ nsXULTreeAccessible::ContainerWidget() const
         nsCOMPtr<nsINode> inputNode = do_QueryInterface(inputElm);
         if (inputNode) {
           nsAccessible* input = 
-            GetAccService()->GetAccessible(inputNode, nsnull);
+            mDoc->GetAccessible(inputNode);
           return input ? input->ContainerWidget() : nsnull;
         }
       }