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:
@@ -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");
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -51,5 +51,8 @@ var LightWeightThemeWebInstallListener = {
|
||||
};
|
||||
|
||||
function getMessageManagerForContent(content) {
|
||||
return content.docShell.messageManager;
|
||||
return content.docShell
|
||||
.sameTypeRootTreeItem
|
||||
.QueryInterface(Ci.nsIInterfaceRequestor)
|
||||
.getInterface(Ci.nsIContentFrameMessageManager);
|
||||
}
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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);
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user