Backed out 3 changesets (bug 1685061, bug 1668218) for dt failures on browser_aboutdebugging_devtoolstoolbox_reload.js . CLOSED TREE

Backed out changeset 734d6233d1cd (bug 1685061)
Backed out changeset 7dcb92850f22 (bug 1668218)
Backed out changeset 2443341cb252 (bug 1685061)

browser/app/profile/firefox.js

@@ -2406,12 +2406,8 @@ pref("devtools.browserconsole.input.editorWidth", 0);
 // Display an onboarding UI for the Editor mode.
 pref("devtools.webconsole.input.editorOnboarding", true);
 
-// Enable the new performance recording panel in Nightly builds.
-#if defined(NIGHTLY_BUILD)
-  pref("devtools.performance.new-panel-enabled", true);
-#else
-  pref("devtools.performance.new-panel-enabled", false);
-#endif
+// Disable the new performance recording panel by default
+pref("devtools.performance.new-panel-enabled", false);
 
 // Enable message grouping in the console, true by default
 pref("devtools.webconsole.groupWarningMessages", true);

devtools/client/definitions.js

@@ -278,11 +278,12 @@ function switchPerformancePanel() {
       return new NewPerformancePanel(frame, target);
     };
     Tools.performance.isTargetSupported = function(target) {
-      // Only use the new performance panel on local tab toolboxes, as they are guaranteed
-      // to have a performance actor.
-      // Remote tab toolboxes (eg about:devtools-toolbox from about:debugging) should not
-      // use the performance panel; about:debugging provides a "Profile performance" button
-      // which can be used instead, without having the overhead of starting a remote toolbox.
+      // Root actors are lazily initialized, so we can't check if the target has
+      // the perf actor yet. Also this function is not async, so we can't initialize
+      // the actor yet.
+      // We don't display the new performance panel for remote context in the
+      // toolbox, because this has an overhead. Instead we should use
+      // about:debugging.
       return target.isLocalTab;
     };
   } else {

devtools/client/locales/en-US/perftools.ftl

@@ -106,17 +106,3 @@ perftools-record-all-registered-threads =
 
 perftools-tools-threads-input-label =
   .title = These thread names are a comma separated list that is used to enable profiling of the threads in the profiler. The name needs to be only a partial match of the thread name to be included. It is whitespace sensitive.
-
-## Onboarding UI labels. These labels are displayed in the new performance panel UI, when
-## both devtools.performance.new-panel-onboarding & devtools.performance.new-panel-enabled
-## preferences are true.
-
--profiler-brand-name = Firefox Profiler
-
-perftools-onboarding-message = <b>New</b>: { -profiler-brand-name } is now integrated into Developer Tools. <a>Learn more</a> about this powerful new tool.
-
-# `options-context-advanced-settings` is defined in toolbox-options.ftl
-perftools-onboarding-reenable-old-panel = (For a limited time, you can access the original Performance panel via <a>{ options-context-advanced-settings }</a>)
-
-perftools-onboarding-close-button =
-  .aria-label = Close the onboarding message

devtools/client/locales/en-US/toolbox-options.ftl

@@ -93,7 +93,7 @@ options-sourceeditor-keybinding-default-label = Default
 
 ## Advanced section
 
-# The heading (this item is also used in perftools.ftl)
+# The heading
 options-context-advanced-settings = Advanced settings
 
 # The label for the checkbox that toggles the HTTP cache on or off

devtools/client/performance-new/components/OnboardingMessage.js

@@ -18,19 +18,13 @@
 
 "use strict";
 
-const {
-  PureComponent,
-  createFactory,
-} = require("devtools/client/shared/vendor/react");
+const { PureComponent } = require("devtools/client/shared/vendor/react");
 const {
   b,
   button,
   div,
   p,
 } = require("devtools/client/shared/vendor/react-dom-factories");
-const Localized = createFactory(
-  require("devtools/client/shared/vendor/fluent-react").Localized
-);
 
 const Services = require("Services");
 const { openDocLink } = require("devtools/client/shared/link");
@@ -101,46 +95,45 @@ class OnboardingMessage extends PureComponent {
       return null;
     }
 
-    const learnMoreLink = button({
-      className: "perf-external-link",
-      onClick: this.handleLearnMoreClick,
-    });
-
-    const settingsLink = button({
-      className: "perf-external-link",
-      onClick: this.handleSettingsClick,
-    });
-
-    const closeButton = Localized(
+    const learnMoreLink = button(
       {
-        id: "perftools-onboarding-close-button",
-        attrs: { "aria-label": true },
+        className: "perf-external-link",
+        onClick: this.handleLearnMoreClick,
       },
-      button({
-        className:
-          "perf-onboarding-close-button perf-photon-button perf-photon-button-ghost",
-        onClick: this.handleCloseIconClick,
-      })
+      "Learn more"
     );
 
+    const settingsLink = button(
+      {
+        className: "perf-external-link",
+        onClick: this.handleSettingsClick,
+      },
+      "Settings > Advanced"
+    );
+
+    const closeButton = button({
+      "aria-label": "Close the onboarding message",
+      className:
+        "perf-onboarding-close-button perf-photon-button perf-photon-button-ghost",
+      onClick: this.handleCloseIconClick,
+    });
+
     return div(
       { className: "perf-onboarding" },
       div(
         { className: "perf-onboarding-message" },
-        Localized(
-          {
-            id: "perftools-onboarding-message",
-            b: b(),
-            a: learnMoreLink,
-          },
-          p({ className: "perf-onboarding-message-row" })
+        p(
+          { className: "perf-onboarding-message-row" },
+          b({}, "New"),
+          ": Firefox Profiler is now integrated into Developer Tools. ",
+          learnMoreLink,
+          " about this powerful new tool."
         ),
-        Localized(
-          {
-            id: "perftools-onboarding-reenable-old-panel",
-            a: settingsLink,
-          },
-          p({ className: "perf-onboarding-message-row" })
+        p(
+          { className: "perf-onboarding-message-row" },
+          "(For a limited time, you can access the original Performance panel via ",
+          settingsLink,
+          ")"
         )
       ),
       closeButton

devtools/client/performance-new/initializer.js

@@ -107,11 +107,7 @@ async function gInit(perfFront, pageContext, openAboutProfiling) {
   }
 
   const l10n = new FluentL10n();
-  await l10n.init([
-    "devtools/client/perftools.ftl",
-    // Needed for the onboarding UI
-    "devtools/client/toolbox-options.ftl",
-  ]);
+  await l10n.init(["devtools/client/perftools.ftl"]);
 
   // Do some initialization, especially with privileged things that are part of the
   // the browser.

devtools/client/performance/test/head.js

@@ -96,9 +96,6 @@ const key = (id, win = window) => {
   // intermittents for the performance tests.
   Services.prefs.setIntPref(PrefUtils.PROFILER_BUFFER_SIZE_PREF, 100000);
 
-  // Force the old panel
-  Services.prefs.setBoolPref("devtools.performance.new-panel-enabled", false);
-
   registerCleanupFunction(() => {
     info("finish() was called, cleaning up...");
 

devtools/client/performance/test/helpers/prefs.js

@@ -49,7 +49,6 @@ exports.DEFAULT_PREF_VALUES = [
   exports.UI_ENABLE_MEMORY_FLAME_CHART,
   "devtools.performance.ui.show-jit-optimizations",
   "devtools.performance.ui.show-triggers-for-gc-types",
-  "devtools.performance.new-panel-enabled",
 ].reduce((prefValues, prefName) => {
   prefValues[prefName] = Preferences.get(prefName);
   return prefValues;