Backed out 4 changesets (bug 1741808, bug 1742541, bug 1605330, bug 1742332) for causing damp failures. CLOSED TREE

Backed out changeset fe65ddb40037 (bug 1605330)
Backed out changeset d5c4c10f70d9 (bug 1742332)
Backed out changeset 9f637151059d (bug 1741808)
Backed out changeset bd54eacb2d7c (bug 1742541)

browser/app/profile/firefox.js

@@ -2234,11 +2234,7 @@ pref("devtools.target-switching.server.enabled", true);
 
 // Setting this preference to true will result in DevTools creating a target for each frame
 // (i.e. not only for top-level document and remote frames).
-#if defined(NIGHTLY_BUILD)
-pref("devtools.every-frame-target.enabled", true);
-#else
 pref("devtools.every-frame-target.enabled", false);
-#endif
 
 // Toolbox Button preferences
 pref("devtools.command-button-pick.enabled", true);
@@ -2464,13 +2460,16 @@ pref("devtools.webconsole.filter.netxhr", false);
 // Webconsole autocomplete preference
 pref("devtools.webconsole.input.autocomplete",true);
 
-// Show context selector in console input
+// Show context selector in console input, in the browser toolbox
 #if defined(NIGHTLY_BUILD)
   pref("devtools.webconsole.input.context", true);
 #else
   pref("devtools.webconsole.input.context", false);
 #endif
 
+// Show context selector in console input, in the content toolbox
+pref("devtools.contenttoolbox.webconsole.input.context", false);
+
 // Set to true to eagerly show the results of webconsole terminal evaluations
 // when they don't have side effects.
 pref("devtools.webconsole.input.eagerEvaluation", true);

devtools/client/webconsole/constants.js

@@ -84,8 +84,11 @@ const prefs = {
       EDITOR_WIDTH: "input.editorWidth",
       // Show the Editor onboarding UI
       EDITOR_ONBOARDING: "devtools.webconsole.input.editorOnboarding",
-      // Show the Input Context the selector
-      CONTEXT_SELECTOR: "devtools.webconsole.input.context",
+      // Show the Input Context the selector in the browser toolbox
+      CONTEXT_SELECTOR_BROWSER_TOOLBOX: "devtools.webconsole.input.context",
+      // Show the Input Context the selector in the content toolbox
+      CONTEXT_SELECTOR_CONTENT_TOOLBOX:
+        "devtools.contenttoolbox.webconsole.input.context",
     },
     FEATURES: {
       // We use the same pref to enable the sidebar on webconsole and browser console.

devtools/client/webconsole/store.js

@@ -81,7 +81,11 @@ function configureStore(webConsoleUI, options = {}) {
       editorWidth: getIntPref(PREFS.UI.EDITOR_WIDTH),
       showEditorOnboarding: getBoolPref(PREFS.UI.EDITOR_ONBOARDING),
       timestampsVisible: getBoolPref(PREFS.UI.MESSAGE_TIMESTAMP),
-      showEvaluationContextSelector: getBoolPref(PREFS.UI.CONTEXT_SELECTOR),
+      showEvaluationContextSelector: getBoolPref(
+        webConsoleUI.isBrowserToolboxConsole
+          ? PREFS.UI.CONTEXT_SELECTOR_BROWSER_TOOLBOX
+          : PREFS.UI.CONTEXT_SELECTOR_CONTENT_TOOLBOX
+      ),
     }),
   };
 

devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector.js

@@ -11,7 +11,7 @@ const IFRAME_PATH = `${FILE_FOLDER}/test-console-evaluation-context-selector-chi
 requestLongerTimeout(2);
 
 add_task(async function() {
-  await pushPref("devtools.webconsole.input.context", true);
+  await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
 
   const hud = await openNewTabWithIframesAndConsole(TEST_URI, [
     `https://example.org/${IFRAME_PATH}?id=iframe-1`,

devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector_iframe_picker.js

@@ -17,7 +17,7 @@ const TEST_URI = `https://example.com/document-builder.sjs?html=${encodeURICompo
 
 add_task(async function() {
   // Enable the context selector and the frames button.
-  await pushPref("devtools.webconsole.input.context", true);
+  await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
   await pushPref("devtools.command-button-frames.enabled", true);
 
   const hud = await openNewTabAndConsole(TEST_URI);

devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector_inspector.js

@@ -20,7 +20,7 @@ Services.scriptloader.loadSubScript(
 requestLongerTimeout(2);
 
 add_task(async function() {
-  await pushPref("devtools.webconsole.input.context", true);
+  await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
 
   const hud = await openNewTabWithIframesAndConsole(TEST_URI, [
     `https://example.org/${IFRAME_PATH}?id=iframe-1`,

devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector_pause_in_debugger.js

@@ -12,7 +12,7 @@ const TEST_URI = `${URL_ROOT_COM_SSL}test-console-evaluation-context-selector.ht
 const IFRAME_FILE = `test-console-evaluation-context-selector-child.html`;
 
 add_task(async function() {
-  await pushPref("devtools.webconsole.input.context", true);
+  await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
 
   const tab = await addTab(TEST_URI);
 

devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector_targets_update.js

@@ -12,7 +12,7 @@ const IFRAME_PATH = `${FILE_FOLDER}/test-console-evaluation-context-selector-chi
 // the context is set to the top one if the destroyed target was selected).
 
 add_task(async function() {
-  await pushPref("devtools.webconsole.input.context", true);
+  await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
 
   const hud = await openNewTabWithIframesAndConsole(TEST_URI, [
     `https://example.net/${IFRAME_PATH}?id=iframe-1`,

devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_selector.js

@@ -18,7 +18,7 @@ const { FileUtils } = ChromeUtils.import(
 const dpr = "--dpr 1";
 
 add_task(async function() {
-  await pushPref("devtools.webconsole.input.context", true);
+  await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
 
   const hud = await openNewTabAndConsole(TEST_URI);
 

devtools/client/webconsole/test/node/mocha-test-setup.js

@@ -38,6 +38,7 @@ pref("devtools.browserconsole.contentMessages", true);
 pref("devtools.webconsole.input.editorWidth", 800);
 pref("devtools.webconsole.input.editorOnboarding", true);
 pref("devtools.webconsole.input.context", false);
+pref("devtools.contenttoolbox.webconsole.input.context", false);
 
 global.loader = {
   lazyServiceGetter: () => {},

devtools/server/actors/thread.js

@@ -77,13 +77,6 @@ loader.lazyRequireGetter(
   true
 );
 
-loader.lazyRequireGetter(
-  this,
-  "isDocumentReady",
-  "devtools/server/actors/inspector/utils",
-  true
-);
-
 const PROMISE_REACTIONS = new WeakMap();
 function cacheReactionsForFrame(frame) {
   if (frame.asyncPromise) {
@@ -467,31 +460,16 @@ const ThreadActor = ActorClassWithSpec(threadSpec, {
   },
 
   _canShowOverlay() {
-    const { window } = this._parent;
-
     // The CanvasFrameAnonymousContentHelper class we're using to create the paused overlay
     // need to have access to a documentElement.
-    // We might have access to a non-chrome window getter that is a Sandox (e.g. in the
-    // case of ContentProcessTargetActor).
-    if (!window?.document?.documentElement) {
-      return false;
-    }
-
-    // Document#insertAnonymousContent requires an access to a CustomContentContainer, which
-    // is only available once the DOM is loaded.
-    // If that's not the case, we simply don't show the overlay. We can't wait for the
-    // DOM to be loaded _and then_ show the overlay, as this will only happen once we resume
-    // and might get the overlay in the page while we're not paused anymore.
-    if (!isDocumentReady(window.document)) {
-      return false;
-    }
-
-    // Ignore privileged document (top level window, special about:* pages, …).
-    if (window.isChromeWindow) {
-      return false;
-    }
-
-    return true;
+    // Accept only browsing context target which exposes such element, but ignore
+    // privileged document (top level window, special about:* pages, …).
+    return (
+      // We might have access to a non-chrome window getter that is a Sandox (e.g. in the
+      // case of ContentProcessTargetActor).
+      this._parent.window?.document?.documentElement &&
+      !this._parent.window.isChromeWindow
+    );
   },
 
   async showOverlay() {

taskcluster/ci/config.yml

@@ -67,7 +67,6 @@ treeherder:
         'M-f-swr': 'Mochitests failures with software webrender enabled'
         'M-f-swr-1proc': 'Mochitests failures with software webrender enabled without e10s'
         'M-f-wayland': 'Mochitests failures with Wayland backend enabled'
-        'M-dt-no-eft-no-fis': 'DevTools Mochitests with EFT and Fission disabled'
         'MSI': 'Repack installers into MSIs'
         'MSIs': 'Signing of Repacked installers of MSIs'
         'MSIX': 'Repack into MSIX package'

taskcluster/ci/test/mochitest.yml

@@ -395,17 +395,12 @@ mochitest-devtools-chrome:
         - socketprocess_networking
         - wayland
         - webrender-sw
-        - devtools-no-eft-no-fission
     run-on-projects:
         by-variant:
             a11y-checks:
                 by-test-platform:
                     linux.*64(-shippable)?-qr/opt: ['trunk']
                     default: []
-            devtools-no-eft-no-fission:
-                by-test-platform:
-                    linux.*64(-shippable)?-qr/opt: ['trunk']
-                    default: []
             fission:
                 by-test-platform:
                     linux.*64(-shippable)?-qr/(opt|debug): ['trunk']

taskcluster/ci/test/variants.yml

@@ -129,13 +129,3 @@ webgl-ipc:
         mozharness:
             extra-options:
                 - "--setpref=webgl.out-of-process=true"
-
-devtools-no-eft-no-fission:
-    description: "{description} with DevTools EFT disabled and Fission disabled"
-    contact: nchevobbe
-    suffix: "dt-no-eft-no-fis"
-    merge:
-        mozharness:
-            extra-options:
-                - "--setpref=devtools.every-frame-target.enabled=false"
-                - "--setpref=fission.autostart=false"