Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset f20fa392e98b (bug 1199755) for assertions/test failures in test_content_integration.htm on a CLOSED TREE

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-10-21 12:28:56 +02:00
parent 4dfc4e00c8
commit ce97f44675
2 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
accessible/mac/Platform.mm
View File

@ -8,7 +8,6 @@
#include "Platform.h"
#include "ProxyAccessible.h"
#include "DocAccessibleParent.h"
#include "mozTableAccessible.h"
#include "nsAppShell.h"
@ -55,29 +54,11 @@ ProxyCreated(ProxyAccessible* aProxy, uint32_t)
uintptr_t accWrap = reinterpret_cast<uintptr_t>(aProxy) | IS_PROXY;
mozAccessible* mozWrapper = [[type alloc] initWithAccessible:accWrap];
aProxy->SetWrapper(reinterpret_cast<uintptr_t>(mozWrapper));
// Invalidate children of native parent if parent is in parent process
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's children if parent is in parent process
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];

16
accessible/mac/mozAccessible.mm
View File

@ -19,7 +19,6 @@
#include "TableAccessible.h"
#include "TableCellAccessible.h"
#include "mozilla/a11y/PDocAccessible.h"
#include "OuterDocAccessible.h"
#include "mozilla/Services.h"
#include "nsRect.h"
@ -646,7 +645,7 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
Accessible* outerDoc = proxy->OuterDocOfRemoteBrowser();
nativeParent = outerDoc ?
GetNativeFromGeckoAccessible(outerDoc) : nil;
GetNativeFromGeckoAccessible(outerDoc->RootAccessible()) : nil;
} else {
return nil;
}
@ -688,19 +687,6 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
nsAutoTArray<Accessible*, 10> childrenArray;
accWrap->GetUnignoredChildren(&childrenArray);
mChildren = ConvertToNSArray(childrenArray);
OuterDocAccessible* docOwner = accWrap->AsOuterDoc();
if (docOwner) {
ProxyAccessible* proxyDoc = docOwner->RemoteChildDoc();
if (proxyDoc) {
mozAccessible* nativeRemoteChild = GetNativeFromProxy(proxyDoc);
if (nativeRemoteChild) {
[mChildren insertObject:nativeRemoteChild atIndex:0];
} else {
NSLog (@"%@ found a child remote doc missing a native\n", self);
}
}
}
} else if (ProxyAccessible* proxy = [self getProxyAccessible]) {
nsAutoTArray<ProxyAccessible*, 10> childrenArray;
GetProxyUnignoredChildren(proxy, &childrenArray);