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

@@ -37,7 +37,18 @@ var gDecoderDoctorObserver = function(subject, topic, data) {
};
function getMessageManagerForWindow(aContentWindow) {
return aContentWindow.docShell.messageManager;
let ir = aContentWindow.docShell
.sameTypeRootTreeItem
.QueryInterface(Ci.nsIInterfaceRequestor);
try {
// If e10s is disabled, this throws NS_NOINTERFACE for closed tabs.
return ir.getInterface(Ci.nsIContentFrameMessageManager);
} catch (e) {
if (e.result == Cr.NS_NOINTERFACE) {
return null;
}
throw e;
}
}
Services.obs.addObserver(gEMEUIObserver, "mediakeys-request");

View File

@@ -425,5 +425,15 @@ function getMessageManagerForWindow(aContentWindow) {
return null;
}
return docShell.messageManager;
let ir = docShell.sameTypeRootTreeItem
.QueryInterface(Ci.nsIInterfaceRequestor);
try {
// This throws NS_NOINTERFACE for closed tabs (only with e10s enabled).
return ir.getInterface(Ci.nsIContentFrameMessageManager);
} catch (e) {
if (e.result == Cr.NS_NOINTERFACE) {
return null;
}
throw e;
}
}

View File

@@ -36,7 +36,10 @@ FormSubmitObserver.prototype =
this._content = aWindow;
this._tab = aTabChildGlobal;
this._mm =
this._content.docShell.messageManager;
this._content.docShell
.sameTypeRootTreeItem
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIContentFrameMessageManager);
this._tab.addEventListener("pageshow", this);
this._tab.addEventListener("unload", this);

View File

@@ -51,5 +51,8 @@ var LightWeightThemeWebInstallListener = {
};
function getMessageManagerForContent(content) {
return content.docShell.messageManager;
return content.docShell
.sameTypeRootTreeItem
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIContentFrameMessageManager);
}

View File

@@ -41,7 +41,10 @@ var LightweightThemeChildHelper = {
const windowEnumerator = Services.ww.getWindowEnumerator();
while (windowEnumerator.hasMoreElements()) {
const window = windowEnumerator.getNext().QueryInterface(Ci.nsIDOMWindow);
const tabChildGlobal = window.docShell.messageManager;
const tabChildGlobal = window.docShell
.sameTypeRootTreeItem
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIContentFrameMessageManager);
const {chromeOuterWindowID, content} = tabChildGlobal;
if (changedKeys.includes(`theme/${chromeOuterWindowID}`) &&
content && this.whitelist.has(content.document.documentURI)) {

View File

@@ -50,7 +50,9 @@ var PageStyleHandler = {
return;
}
let mm = win.docShell.messageManager;
let mm = win.docShell
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIContentFrameMessageManager);
this.sendStyleSheetInfo(mm);
},