nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1568279. Remove some unnecessary QIs to nsIDOMChromeWindow. r=nalexander

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D39066

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Boris Zbarsky 2019-07-23 19:08:55 +00:00
parent a22a750ddc
commit 3381384634
7 changed files with 14 additions and 22 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
mobile/android/chrome/content/aboutAddons.js
View file

@ -25,9 +25,7 @@ var gStringBundle = Services.strings.createBundle(
); );
XPCOMUtils.defineLazyGetter(window, "gChromeWin", function() { XPCOMUtils.defineLazyGetter(window, "gChromeWin", function() {
return window.docShell.rootTreeItem.domWindow.QueryInterface( return window.docShell.rootTreeItem.domWindow;
Ci.nsIDOMChromeWindow
);
}); });
ChromeUtils.defineModuleGetter( ChromeUtils.defineModuleGetter(
window, window,

6
mobile/android/chrome/content/aboutLogins.js
View file

@ -11,8 +11,10 @@ const { XPCOMUtils } = ChromeUtils.import(
); );
const { Accounts } = ChromeUtils.import("resource://gre/modules/Accounts.jsm"); const { Accounts } = ChromeUtils.import("resource://gre/modules/Accounts.jsm");
XPCOMUtils.defineLazyGetter(window, "gChromeWin", () => XPCOMUtils.defineLazyGetter(
window.docShell.rootTreeItem.domWindow.QueryInterface(Ci.nsIDOMChromeWindow) window,
"gChromeWin",
() => window.docShell.rootTreeItem.domWindow
); );
ChromeUtils.defineModuleGetter( ChromeUtils.defineModuleGetter(

6
mobile/android/chrome/content/aboutPrivateBrowsing.js
View file

@ -12,8 +12,10 @@ const { PrivateBrowsingUtils } = ChromeUtils.import(
"resource://gre/modules/PrivateBrowsingUtils.jsm" "resource://gre/modules/PrivateBrowsingUtils.jsm"
); );
XPCOMUtils.defineLazyGetter(window, "gChromeWin", () => XPCOMUtils.defineLazyGetter(
window.docShell.rootTreeItem.domWindow.QueryInterface(Ci.nsIDOMChromeWindow) window,
"gChromeWin",
() => window.docShell.rootTreeItem.domWindow
); );
document.addEventListener("DOMContentLoaded", function() { document.addEventListener("DOMContentLoaded", function() {

5
mobile/android/components/ContentPermissionPrompt.js
View file

@ -61,10 +61,7 @@ ContentPermissionPrompt.prototype = {
}, },
getChromeWindow: function getChromeWindow(aWindow) { getChromeWindow: function getChromeWindow(aWindow) {
let chromeWin = aWindow.docShell.rootTreeItem.domWindow.QueryInterface( return aWindow.docShell.rootTreeItem.domWindow;
Ci.nsIDOMChromeWindow
);
return chromeWin;
}, },
getChromeForRequest: function getChromeForRequest(request) { getChromeForRequest: function getChromeForRequest(request) {

6
mobile/android/modules/ActionBarHandler.jsm
View file

@ -587,8 +587,7 @@ var ActionBarHandler = {
if (chrome.BrowserApp && chrome.BrowserApp.loadURI) { if (chrome.BrowserApp && chrome.BrowserApp.loadURI) {
chrome.BrowserApp.loadURI(uri); chrome.BrowserApp.loadURI(uri);
} else { } else {
let bwin = chrome.QueryInterface(Ci.nsIDOMChromeWindow) let bwin = chrome.browserDOMWindow;
.browserDOMWindow;
if (bwin) { if (bwin) {
bwin.openURI( bwin.openURI(
Services.io.newURI(uri), Services.io.newURI(uri),
@ -647,8 +646,7 @@ var ActionBarHandler = {
isPrivate: isPrivate, isPrivate: isPrivate,
}); });
} else { } else {
let bwin = chrome.QueryInterface(Ci.nsIDOMChromeWindow) let bwin = chrome.browserDOMWindow;
.browserDOMWindow;
if (bwin) { if (bwin) {
bwin.openURI( bwin.openURI(
searchSubmission.uri, searchSubmission.uri,

5
mobile/android/modules/WebrtcUI.jsm
View file

@ -365,10 +365,7 @@ var WebrtcUI = {
}, },
getChromeWindow: function getChromeWindow(aWindow) { getChromeWindow: function getChromeWindow(aWindow) {
let chromeWin = aWindow.docShell.rootTreeItem.domWindow.QueryInterface( return aWindow.docShell.rootTreeItem.domWindow;
Ci.nsIDOMChromeWindow
);
return chromeWin;
}, },
prompt: function prompt( prompt: function prompt(

4
testing/specialpowers/content/SpecialPowersAPI.jsm
View file

@ -1036,9 +1036,7 @@ class SpecialPowersAPI extends JSWindowActorChild {
// XXX: these APIs really ought to be removed, they're not e10s-safe. // XXX: these APIs really ought to be removed, they're not e10s-safe.
// (also they're pretty Firefox-specific) // (also they're pretty Firefox-specific)
_getTopChromeWindow(window) { _getTopChromeWindow(window) {
return window.docShell.rootTreeItem.domWindow.QueryInterface( return window.docShell.rootTreeItem.domWindow;
Ci.nsIDOMChromeWindow
);
} }
_getAutoCompletePopup(window) { _getAutoCompletePopup(window) {
return this._getTopChromeWindow(window).document.getElementById( return this._getTopChromeWindow(window).document.getElementById(