From d03a54da64eadb221cf5000d22b73fe0476e944b Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Mon, 19 Jul 2021 17:01:06 +0200 Subject: [PATCH] browser(firefox): revert devtools flag CLI command (#7717) revert 786f6c4d3129cde349600d82de7ab307f62ca33b --- browser_patches/firefox-beta/BUILD_NUMBER | 4 +- .../firefox-beta/patches/bootstrap.diff | 61 ------------------- browser_patches/firefox/BUILD_NUMBER | 4 +- .../firefox/patches/bootstrap.diff | 61 ------------------- 4 files changed, 4 insertions(+), 126 deletions(-) diff --git a/browser_patches/firefox-beta/BUILD_NUMBER b/browser_patches/firefox-beta/BUILD_NUMBER index 7cbd8b3048..503301b4b4 100644 --- a/browser_patches/firefox-beta/BUILD_NUMBER +++ b/browser_patches/firefox-beta/BUILD_NUMBER @@ -1,2 +1,2 @@ -1270 -Changed: aslushnikov@gmail.com Tue Jul 13 16:28:05 UTC 2021 +1271 +Changed: max@schmitt.mx Mon 19 Jul 2021 13:53:35 CEST diff --git a/browser_patches/firefox-beta/patches/bootstrap.diff b/browser_patches/firefox-beta/patches/bootstrap.diff index 688254cb11..e4312735d8 100644 --- a/browser_patches/firefox-beta/patches/bootstrap.diff +++ b/browser_patches/firefox-beta/patches/bootstrap.diff @@ -171,67 +171,6 @@ index 040c7b124dec6bb254563bbe74fe50012cb077a3..b4e6b8132786af70e8ad0dce88b67c28 const transportProvider = { setListener(upgradeListener) { -diff --git a/devtools/startup/DevToolsStartup.jsm b/devtools/startup/DevToolsStartup.jsm -index 2c1f767f89f596fb5732572ad4e0cad3cafcc7c3..99401071ad93a2f2a3ba37e7643920f2e05e8b25 100644 ---- a/devtools/startup/DevToolsStartup.jsm -+++ b/devtools/startup/DevToolsStartup.jsm -@@ -375,7 +375,7 @@ DevToolsStartup.prototype = { - - // Store devtoolsFlag to check it later in onWindowReady. - this.devtoolsFlag = flags.devtools; -- -+ this.autoOpenDevtoolsForTabs = flags.autoOpenDevtoolsForTabs; - /* eslint-disable mozilla/balanced-observers */ - // We are not expecting to remove those listeners until Firefox closes. - -@@ -438,6 +438,7 @@ DevToolsStartup.prototype = { - - const console = cmdLine.handleFlag("jsconsole", false); - const devtools = cmdLine.handleFlag("devtools", false); -+ const autoOpenDevtoolsForTabs = cmdLine.handleFlag("auto-open-devtools-for-tabs", false); - - let devToolsServer; - try { -@@ -460,7 +461,7 @@ DevToolsStartup.prototype = { - debuggerFlag = cmdLine.handleFlag("jsdebugger", false); - } - -- return { console, debugger: debuggerFlag, devtools, devToolsServer }; -+ return { console, debugger: debuggerFlag, devtools, autoOpenDevtoolsForTabs, devToolsServer }; - }, - - /** -@@ -482,9 +483,22 @@ DevToolsStartup.prototype = { - this._firstWindowReadyReceived = true; - } - -+ if (this.autoOpenDevtoolsForTabs) { -+ this.handleDevToolsOpenForEveryTab(window); -+ } -+ - JsonView.initialize(); - }, - -+ handleDevToolsOpenForEveryTab(window) { -+ const require = this.initDevTools("CommandLine"); -+ const { gDevTools } = require("devtools/client/framework/devtools"); -+ window.gBrowser.tabContainer.addEventListener('TabOpen', async (event) => { -+ await gDevTools.showToolboxForTab(event.target); -+ }); -+ gDevTools.showToolboxForTab(window.gBrowser.selectedTab).catch(() => {}); -+ }, -+ - removeDevToolsMenus(window) { - // This will hide the "Tools > Web Developer" menu. - window.document.getElementById("webDeveloperMenu").hidden = true; -@@ -1243,6 +1257,7 @@ DevToolsStartup.prototype = { - " Enables debugging (some) application startup code paths.\n" + - " Only has an effect when `--jsdebugger` is also supplied.\n" + - " --devtools Open DevTools on initial load.\n" + -+ " --auto-open-devtools-for-tabs Open DevTools on new Tabs.\n" + - " --start-debugger-server [ws:][ | ] Start the devtools server on\n" + - " a TCP port or Unix domain socket path. Defaults to TCP port\n" + - " 6000. Use WebSocket protocol if ws: prefix is specified.\n", diff --git a/docshell/base/BrowsingContext.cpp b/docshell/base/BrowsingContext.cpp index 0093288d1a448afe7bd8e5b6e8c0cb31835ba3f5..93908f5719f2cb0fe2f58d7f3153a9af0e71f08b 100644 --- a/docshell/base/BrowsingContext.cpp diff --git a/browser_patches/firefox/BUILD_NUMBER b/browser_patches/firefox/BUILD_NUMBER index 3079b6ed81..5609c2d929 100644 --- a/browser_patches/firefox/BUILD_NUMBER +++ b/browser_patches/firefox/BUILD_NUMBER @@ -1,2 +1,2 @@ -1278 -Changed: lushnikov@chromium.org Wed 14 Jul 2021 05:48:27 AM PDT +1279 +Changed: max@schmitt.mx Mon 19 Jul 2021 13:53:35 CEST diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff index 688254cb11..e4312735d8 100644 --- a/browser_patches/firefox/patches/bootstrap.diff +++ b/browser_patches/firefox/patches/bootstrap.diff @@ -171,67 +171,6 @@ index 040c7b124dec6bb254563bbe74fe50012cb077a3..b4e6b8132786af70e8ad0dce88b67c28 const transportProvider = { setListener(upgradeListener) { -diff --git a/devtools/startup/DevToolsStartup.jsm b/devtools/startup/DevToolsStartup.jsm -index 2c1f767f89f596fb5732572ad4e0cad3cafcc7c3..99401071ad93a2f2a3ba37e7643920f2e05e8b25 100644 ---- a/devtools/startup/DevToolsStartup.jsm -+++ b/devtools/startup/DevToolsStartup.jsm -@@ -375,7 +375,7 @@ DevToolsStartup.prototype = { - - // Store devtoolsFlag to check it later in onWindowReady. - this.devtoolsFlag = flags.devtools; -- -+ this.autoOpenDevtoolsForTabs = flags.autoOpenDevtoolsForTabs; - /* eslint-disable mozilla/balanced-observers */ - // We are not expecting to remove those listeners until Firefox closes. - -@@ -438,6 +438,7 @@ DevToolsStartup.prototype = { - - const console = cmdLine.handleFlag("jsconsole", false); - const devtools = cmdLine.handleFlag("devtools", false); -+ const autoOpenDevtoolsForTabs = cmdLine.handleFlag("auto-open-devtools-for-tabs", false); - - let devToolsServer; - try { -@@ -460,7 +461,7 @@ DevToolsStartup.prototype = { - debuggerFlag = cmdLine.handleFlag("jsdebugger", false); - } - -- return { console, debugger: debuggerFlag, devtools, devToolsServer }; -+ return { console, debugger: debuggerFlag, devtools, autoOpenDevtoolsForTabs, devToolsServer }; - }, - - /** -@@ -482,9 +483,22 @@ DevToolsStartup.prototype = { - this._firstWindowReadyReceived = true; - } - -+ if (this.autoOpenDevtoolsForTabs) { -+ this.handleDevToolsOpenForEveryTab(window); -+ } -+ - JsonView.initialize(); - }, - -+ handleDevToolsOpenForEveryTab(window) { -+ const require = this.initDevTools("CommandLine"); -+ const { gDevTools } = require("devtools/client/framework/devtools"); -+ window.gBrowser.tabContainer.addEventListener('TabOpen', async (event) => { -+ await gDevTools.showToolboxForTab(event.target); -+ }); -+ gDevTools.showToolboxForTab(window.gBrowser.selectedTab).catch(() => {}); -+ }, -+ - removeDevToolsMenus(window) { - // This will hide the "Tools > Web Developer" menu. - window.document.getElementById("webDeveloperMenu").hidden = true; -@@ -1243,6 +1257,7 @@ DevToolsStartup.prototype = { - " Enables debugging (some) application startup code paths.\n" + - " Only has an effect when `--jsdebugger` is also supplied.\n" + - " --devtools Open DevTools on initial load.\n" + -+ " --auto-open-devtools-for-tabs Open DevTools on new Tabs.\n" + - " --start-debugger-server [ws:][ | ] Start the devtools server on\n" + - " a TCP port or Unix domain socket path. Defaults to TCP port\n" + - " 6000. Use WebSocket protocol if ws: prefix is specified.\n", diff --git a/docshell/base/BrowsingContext.cpp b/docshell/base/BrowsingContext.cpp index 0093288d1a448afe7bd8e5b6e8c0cb31835ba3f5..93908f5719f2cb0fe2f58d7f3153a9af0e71f08b 100644 --- a/docshell/base/BrowsingContext.cpp