Backed out 3 changesets (bug 1479569) for devtools/client/responsive.html failures. CLOSED TREE

Backed out changeset e123d0aa911c (bug 1479569)
Backed out changeset b828a58404e5 (bug 1479569)
Backed out changeset 97041ef8f311 (bug 1479569)
This commit is contained in:
Csoregi Natalia
2018-08-03 10:39:12 +03:00
parent 56069dc7d1
commit 5bd0ca7b64
57 changed files with 266 additions and 167 deletions

View File

@@ -2820,7 +2820,8 @@ nsFrameLoader::DoLoadMessageManagerScript(const nsAString& aURL, bool aRunInGlob
if (tabParent) {
return tabParent->SendLoadRemoteScript(nsString(aURL), aRunInGlobalScope);
}
RefPtr<nsInProcessTabChildGlobal> tabChild = GetTabChildGlobal();
RefPtr<nsInProcessTabChildGlobal> tabChild =
static_cast<nsInProcessTabChildGlobal*>(GetTabChildGlobalAsEventTarget());
if (tabChild) {
tabChild->LoadFrameScript(aURL, aRunInGlobalScope);
}
@@ -2978,6 +2979,12 @@ nsFrameLoader::ReallyLoadFrameScripts()
return NS_OK;
}
EventTarget*
nsFrameLoader::GetTabChildGlobalAsEventTarget()
{
return mChildMessageManager.get();
}
already_AddRefed<Element>
nsFrameLoader::GetOwnerElement()
{