зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset b5df002db72c (bug 1558390) for build bustages on a CLOSED TREE
This commit is contained in:
Родитель
ee87fa7f84
Коммит
ab94a895b6
|
@ -37,8 +37,14 @@ OuterDocAccessible::OuterDocAccessible(nsIContent* aContent,
|
|||
if (IPCAccessibilityActive()) {
|
||||
auto bridge = dom::BrowserBridgeChild::GetFrom(aContent);
|
||||
if (bridge) {
|
||||
// This is an iframe which will be rendered in another process.
|
||||
SendEmbedderAccessible(bridge);
|
||||
// This is an iframe which will be rendered in another process. Tell the
|
||||
// parent process the iframe accessible so it can link the
|
||||
// trees together when the iframe document is added.
|
||||
DocAccessibleChild* ipcDoc = aDoc->IPCDoc();
|
||||
if (ipcDoc) {
|
||||
uint64_t id = reinterpret_cast<uintptr_t>(UniqueID());
|
||||
bridge->SendSetEmbedderAccessible(ipcDoc, id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -53,16 +59,6 @@ OuterDocAccessible::OuterDocAccessible(nsIContent* aContent,
|
|||
|
||||
OuterDocAccessible::~OuterDocAccessible() {}
|
||||
|
||||
void OuterDocAccessible::SendEmbedderAccessible(
|
||||
dom::BrowserBridgeChild* aBridge) {
|
||||
MOZ_ASSERT(mDoc);
|
||||
DocAccessibleChild* ipcDoc = mDoc->IPCDoc();
|
||||
if (ipcDoc) {
|
||||
uint64_t id = reinterpret_cast<uintptr_t>(UniqueID());
|
||||
aBridge->SendSetEmbedderAccessible(ipcDoc, id);
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Accessible public (DON'T add methods here)
|
||||
|
||||
|
|
|
@ -9,11 +9,6 @@
|
|||
#include "AccessibleWrap.h"
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
namespace dom {
|
||||
class BrowserBridgeChild;
|
||||
}
|
||||
|
||||
namespace a11y {
|
||||
class DocAccessibleParent;
|
||||
|
||||
|
@ -37,16 +32,6 @@ class OuterDocAccessible final : public AccessibleWrap {
|
|||
Accessible* RemoteChildDocAccessible() const;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* For iframes in a content process which will be rendered in another content
|
||||
* process, tell the parent process about this OuterDocAccessible
|
||||
* so it can link the trees together when the embedded document is added.
|
||||
* Note that an OuterDocAccessible can be created before the
|
||||
* BrowserBridgeChild or vice versa. Therefore, this must be conditionally
|
||||
* called when either of these is created.
|
||||
*/
|
||||
void SendEmbedderAccessible(dom::BrowserBridgeChild* aBridge);
|
||||
|
||||
// Accessible
|
||||
virtual void Shutdown() override;
|
||||
virtual mozilla::a11y::role NativeRole() const override;
|
||||
|
|
|
@ -8,7 +8,6 @@ EXPORTS.mozilla.a11y += [
|
|||
'Accessible.h',
|
||||
'DocAccessible.h',
|
||||
'HyperTextAccessible.h',
|
||||
'OuterDocAccessible.h',
|
||||
]
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
|
|
|
@ -225,9 +225,6 @@
|
|||
# ifdef XP_WIN
|
||||
# include "mozilla/a11y/AccessibleWrap.h"
|
||||
# endif
|
||||
# include "mozilla/a11y/DocAccessible.h"
|
||||
# include "mozilla/a11y/DocManager.h"
|
||||
# include "mozilla/a11y/OuterDocAccessible.h"
|
||||
#endif
|
||||
|
||||
#include "mozilla/dom/File.h"
|
||||
|
@ -2070,20 +2067,6 @@ already_AddRefed<RemoteBrowser> ContentChild::CreateBrowser(
|
|||
aBrowsingContext, chromeFlags, tabId);
|
||||
browserBridge->mIPCOpen = true;
|
||||
|
||||
#if defined(ACCESSIBILITY)
|
||||
a11y::DocAccessible* docAcc =
|
||||
a11y::GetExistingDocAccessible(owner->OwnerDoc());
|
||||
if (docAcc) {
|
||||
a11y::Accessible* ownerAcc = docAcc->GetAccessible(owner);
|
||||
if (ownerAcc) {
|
||||
a11y::OuterDocAccessible* outerAcc = ownerAcc->AsOuterDoc();
|
||||
if (outerAcc) {
|
||||
outerAcc->SendEmbedderAccessible(browserBridge);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif // defined(ACCESSIBILITY)
|
||||
|
||||
RefPtr<BrowserBridgeHost> browserBridgeHost =
|
||||
new BrowserBridgeHost(browserBridge);
|
||||
return browserBridgeHost.forget();
|
||||
|
|
Загрузка…
Ссылка в новой задаче