Bug 1199755 - Retrieve native proxy children when mozAccessible child…

…ren is called on outerdocs in parent r=tbsaunde
Brli · Jun 9, 2016 · 3cbc320 · 3cbc320
1 parent 21ef3ac
commit 3cbc320
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/accessible/ipc/ProxyAccessible.cpp b/accessible/ipc/ProxyAccessible.cpp
@@ -1185,7 +1185,6 @@ ProxyAccessible::OuterDocOfRemoteBrowser() const
     return nullptr;
 
   DocAccessible* chromeDoc = GetExistingDocAccessible(frame->OwnerDoc());
-  NS_ASSERTION(chromeDoc, "accessible tab in not accessible chromeDocument");
 
   return chromeDoc ? chromeDoc->GetAccessible(frame) : nullptr;
 }

diff --git a/accessible/mac/Platform.mm b/accessible/mac/Platform.mm
@@ -8,6 +8,7 @@
 
 #include "Platform.h"
 #include "ProxyAccessible.h"
+#include "DocAccessibleParent.h"
 #include "mozTableAccessible.h"
 
 #include "nsAppShell.h"
@@ -54,11 +55,29 @@
   uintptr_t accWrap = reinterpret_cast<uintptr_t>(aProxy) | IS_PROXY;
   mozAccessible* mozWrapper = [[type alloc] initWithAccessible:accWrap];
   aProxy->SetWrapper(reinterpret_cast<uintptr_t>(mozWrapper));
+
+  // Invalidate native parent in parent process's children on proxy creation
+  if (aProxy->IsDoc() && aProxy->AsDoc()->IsTopLevel()) {
+    Accessible* outerDoc = aProxy->OuterDocOfRemoteBrowser();
+    if (outerDoc) {
+      mozAccessible* nativeParent = GetNativeFromGeckoAccessible(outerDoc);
+      [nativeParent invalidateChildren];
+    }
+  }
 }
 
 void
 ProxyDestroyed(ProxyAccessible* aProxy)
 {
+  // Invalidate native parent in parent process's children on proxy destruction
+  if (aProxy->IsDoc() && aProxy->AsDoc()->IsTopLevel()) {
+    Accessible* outerDoc = aProxy->OuterDocOfRemoteBrowser();
+    if (outerDoc) {
+      mozAccessible* nativeParent = GetNativeFromGeckoAccessible(outerDoc);
+      [nativeParent invalidateChildren];
+    }
+  }
+
   mozAccessible* wrapper = GetNativeFromProxy(aProxy);
   [wrapper expire];
   [wrapper release];

diff --git a/accessible/mac/mozAccessible.mm b/accessible/mac/mozAccessible.mm
@@ -19,6 +19,7 @@
 #include "TableAccessible.h"
 #include "TableCellAccessible.h"
 #include "mozilla/a11y/PDocAccessible.h"
+#include "OuterDocAccessible.h"
 
 #include "mozilla/Services.h"
 #include "nsRect.h"
@@ -619,6 +620,15 @@ - (NSArray*)children
         [mChildren addObject:nativeChild];
     }
 
+    // children from child if this is an outerdoc
+    OuterDocAccessible* docOwner = accWrap->AsOuterDoc();
+    if (docOwner) {
+      if (ProxyAccessible* proxyDoc = docOwner->RemoteChildDoc()) {
+        mozAccessible* nativeRemoteChild = GetNativeFromProxy(proxyDoc);
+        [mChildren insertObject:nativeRemoteChild atIndex:0];
+        NSAssert1 (nativeRemoteChild, @"%@ found a child remote doc missing a native\n", self);
+      }
+    }
   } else if (ProxyAccessible* proxy = [self getProxyAccessible]) {
       uint32_t childCount = proxy->ChildrenCount();
       for (uint32_t childIdx = 0; childIdx < childCount; childIdx++) {