Bug 560239 - no children of application accessible for open windows before accessibility was started (part2), r=marcoz, davidb, sr=neil, a=philor

accessible/src/base/nsApplicationAccessible.cpp

@@ -265,10 +265,10 @@ nsApplicationAccessible::CacheChildren()
   // children are requested because empty InvalidateChldren() prevents its
   // repeated calls.
 
-  // Basicly children are kept updated by Add/RemoveRootAccessible method
+  // Basically children are kept updated by Add/RemoveRootAccessible method
   // calls. However if there are open windows before accessibility was started
   // then we need to make sure root accessibles for open windows are created so
-  // that all root accessible are stored in application accessible children
+  // that all root accessibles are stored in application accessible children
   // array.
 
   nsCOMPtr<nsIWindowMediator> windowMediator =

accessible/src/base/nsDocAccessible.cpp

@@ -2124,7 +2124,7 @@ nsDocAccessible::GetAccessibleInParentChain(nsIDOMNode *aNode,
       currentNode = relevantNode;
     }
     if (aCanCreate) {
-      nsRefPtr<nsAccessNode> acc =
+      nsRefPtr<nsAccessible> acc =
         GetAccService()->GetAccessibleInWeakShell(currentNode, mWeakShell);
       if (acc)
         CallQueryInterface(acc, aAccessible);

accessible/tests/mochitest/tree/Makefile.in

@@ -46,7 +46,7 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES =\
-  $(warning test_applicationacc.xul temporarily disabled) \
+  $(warning test_applicationacc.xul temporarily disabled, see bug 561508) \
 		test_aria_globals.html \
 		test_aria_imgmap.html \
 		test_button.xul \

accessible/tests/mochitest/tree/test_applicationacc.xul

@@ -6,7 +6,7 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="Accessible Application Accessible hierarchy tests">
 
-  <script type="application/javascript" 
+  <script type="application/javascript"
           src="chrome://mochikit/content/MochiKit/packed.js" />
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
@@ -21,7 +21,7 @@
     ////////////////////////////////////////////////////////////////////////////
     // Test
 
-    // Note: but 560239 can be tested if this test runs in standalone mode only.
+    // Note: bug 560239 can be tested if this test runs in standalone mode only.
  
     var gURL = "chrome://mochikit/content/a11y/accessible/tree/wnd.xul"
     var gWnd = window.openDialog(gURL, "wnd", "chrome,width=600,height=600");