From d182c953512707cbefa47620f34a81e9c3a9e2df Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Tue, 21 Jul 2020 22:19:19 +0000 Subject: [PATCH] Bug 1651519: Part 2 - Also remove nsIDOMWindowUtils::outerWindowID. r=nika,geckoview-reviewers,agi Differential Revision: https://phabricator.services.mozilla.com/D82957 --- browser/actors/ContextMenuChild.jsm | 2 +- browser/actors/LightweightThemeChild.jsm | 2 +- browser/base/content/content-refreshblocker.js | 2 +- browser/base/content/tabbrowser.js | 2 +- .../test/browser/browser_ext_sidebarAction.js | 2 +- ...wser_615394-SSWindowState_events_setBrowserState.js | 2 +- .../client/framework/test/browser_target_from_url.js | 2 +- devtools/client/framework/test/browser_two_tabs.js | 4 ++-- devtools/client/fronts/root.js | 9 +++------ devtools/server/actors/targets/browsing-context.js | 10 +++++----- dom/base/nsDOMWindowUtils.cpp | 9 --------- dom/base/test/browser_messagemanager_unload.js | 2 +- dom/base/test/chrome/test_chromeOuterWindowID.xhtml | 2 +- dom/browser-element/BrowserElementChildPreload.js | 6 ++---- dom/browser-element/BrowserElementPromptService.jsm | 2 +- dom/interfaces/base/nsIDOMWindowUtils.idl | 5 ----- dom/media/PeerConnection.jsm | 2 +- dom/tests/mochitest/bugs/test_bug534149.html | 6 ++---- .../tests/chrome/test_windowProxyDeadWrapper.html | 2 +- .../tests/mochitest/test_nukeContentWindow.html | 2 +- mobile/android/modules/geckoview/GeckoViewTab.jsm | 4 +--- .../modules/geckoview/GeckoViewWebExtension.jsm | 4 ++-- testing/marionette/listener.js | 2 +- toolkit/components/extensions/WebNavigationContent.js | 10 +--------- toolkit/components/extensions/parent/ext-tabs-base.js | 2 +- toolkit/components/extensions/parent/ext-theme.js | 6 ++---- toolkit/content/widgets/editor.js | 2 +- toolkit/modules/LightweightThemeConsumer.jsm | 2 +- 28 files changed, 37 insertions(+), 70 deletions(-) diff --git a/browser/actors/ContextMenuChild.jsm b/browser/actors/ContextMenuChild.jsm index ae761bd5116a..2bb991d16ffc 100644 --- a/browser/actors/ContextMenuChild.jsm +++ b/browser/actors/ContextMenuChild.jsm @@ -905,7 +905,7 @@ class ContextMenuChild extends JSWindowActorChild { ); context.frameOuterWindowID = - context.target.ownerGlobal.windowUtils.outerWindowID; + context.target.ownerGlobal.docShell.outerWindowID; context.frameBrowsingContextID = context.target.ownerGlobal.browsingContext.id; diff --git a/browser/actors/LightweightThemeChild.jsm b/browser/actors/LightweightThemeChild.jsm index 2ffc90bc1277..b98c8eb7955b 100644 --- a/browser/actors/LightweightThemeChild.jsm +++ b/browser/actors/LightweightThemeChild.jsm @@ -30,7 +30,7 @@ class LightweightThemeChild extends JSWindowActorChild { } // We don't have a message manager, so presumable we're running in a sidebar // in the parent process. - return this.contentWindow.top.windowUtils.outerWindowID; + return this.contentWindow.top.docShell.outerWindowID; } /** diff --git a/browser/base/content/content-refreshblocker.js b/browser/base/content/content-refreshblocker.js index 007c959af394..5e31f8375633 100644 --- a/browser/base/content/content-refreshblocker.js +++ b/browser/base/content/content-refreshblocker.js @@ -144,7 +144,7 @@ var RefreshBlocker = { */ onRefreshAttempted(aWebProgress, aURI, aDelay, aSameURI) { let win = aWebProgress.DOMWindow; - let outerWindowID = win.windowUtils.outerWindowID; + let outerWindowID = win.docShell.outerWindowID; let data = { URI: aURI.spec, diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js index 0bb0605c238d..e031fdc0fae4 100644 --- a/browser/base/content/tabbrowser.js +++ b/browser/base/content/tabbrowser.js @@ -5199,7 +5199,7 @@ this._uniquePanelIDCounter = 0; } - let outerID = window.windowUtils.outerWindowID; + let outerID = window.docShell.outerWindowID; // We want panel IDs to be globally unique, that's why we include the // window ID. We switched to a monotonic counter as Date.now() lead diff --git a/browser/components/extensions/test/browser/browser_ext_sidebarAction.js b/browser/components/extensions/test/browser/browser_ext_sidebarAction.js index be9c85a479fd..ae5ad44e12e8 100644 --- a/browser/components/extensions/test/browser/browser_ext_sidebarAction.js +++ b/browser/components/extensions/test/browser/browser_ext_sidebarAction.js @@ -166,7 +166,7 @@ add_task(async function sidebar_isOpen() { await sendMessage(extension2, "isOpen", { result: false }); info("Test passing a windowId parameter"); - let windowId = window.windowUtils.outerWindowID; + let windowId = window.docShell.outerWindowID; let WINDOW_ID_CURRENT = -2; await sendMessage(extension1, "isOpen", { arg: { windowId }, result: true }); await sendMessage(extension2, "isOpen", { arg: { windowId }, result: false }); diff --git a/browser/components/sessionstore/test/browser_615394-SSWindowState_events_setBrowserState.js b/browser/components/sessionstore/test/browser_615394-SSWindowState_events_setBrowserState.js index 1cd6216bfdc4..24e7b164eaec 100644 --- a/browser/components/sessionstore/test/browser_615394-SSWindowState_events_setBrowserState.js +++ b/browser/components/sessionstore/test/browser_615394-SSWindowState_events_setBrowserState.js @@ -66,7 +66,7 @@ const lameMultiWindowState = { }; function getOuterWindowID(aWindow) { - return aWindow.windowUtils.outerWindowID; + return aWindow.docShell.outerWindowID; } function test() { diff --git a/devtools/client/framework/test/browser_target_from_url.js b/devtools/client/framework/test/browser_target_from_url.js index 0b831bb934c1..cdca00178bcb 100644 --- a/devtools/client/framework/test/browser_target_from_url.js +++ b/devtools/client/framework/test/browser_target_from_url.js @@ -38,7 +38,7 @@ add_task(async function() { } info("Test browser window"); - let windowId = window.windowUtils.outerWindowID; + let windowId = window.docShell.outerWindowID; target = await targetFromURL( new URL("http://foo?type=window&id=" + windowId) ); diff --git a/devtools/client/framework/test/browser_two_tabs.js b/devtools/client/framework/test/browser_two_tabs.js index 5bc792042468..1ed856cd3d54 100644 --- a/devtools/client/framework/test/browser_two_tabs.js +++ b/devtools/client/framework/test/browser_two_tabs.js @@ -47,8 +47,8 @@ async function checkGetTab(client, tab1, tab2, targetFront1, targetFront2) { if (tab1.linkedBrowser.frameLoader.remoteTab) { filter.tabId = tab1.linkedBrowser.frameLoader.remoteTab.tabId; } else { - const windowUtils = tab1.linkedBrowser.contentWindow.windowUtils; - filter.outerWindowID = windowUtils.outerWindowID; + const { docShell } = tab1.linkedBrowser.contentWindow; + filter.outerWindowID = docShell.outerWindowID; } front = await getTabTarget(client, filter); is( diff --git a/devtools/client/fronts/root.js b/devtools/client/fronts/root.js index f565375d65f8..6af711b8ba43 100644 --- a/devtools/client/fronts/root.js +++ b/devtools/client/fronts/root.js @@ -222,13 +222,10 @@ class RootFront extends FrontClassWithSpec(rootSpec) { if (browser.frameLoader.remoteTab) { // Tabs in child process packet.tabId = browser.frameLoader.remoteTab.tabId; - } else if (browser.outerWindowID) { - // tabs in parent process - packet.outerWindowID = browser.outerWindowID; } else { - //