Backed out 3 changesets (bug 1500354) for dt failures on browser_aboutdebugging_serviceworker_timeout.js . CLOSED TREE
authorNarcis Beleuzu <nbeleuzu@mozilla.com>
Tue, 30 Apr 2019 02:04:43 +0300
changeset 530643 31c0dbb08e0c5bc4e9dbc46bca1c7d44bc9331e6
parent 530642 f7e1b8a24398e572fe25ed0b40d7db6df0f5cc18
child 530644 ffbfe4a683f6fc5a2a89fa86e9d992f4c4e00f22
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1500354
milestone68.0a1
backs out6596c844c27e39c3efdf2f26e8d2d4c52852165c
dbb2526ae6ebd9b8554597655111b04c4406a6b0
e9e6acc1b0cc8638b270543c7b39c944fc1698af
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 3 changesets (bug 1500354) for dt failures on browser_aboutdebugging_serviceworker_timeout.js . CLOSED TREE Backed out changeset 6596c844c27e (bug 1500354) Backed out changeset dbb2526ae6eb (bug 1500354) Backed out changeset e9e6acc1b0cc (bug 1500354)
devtools/client/aboutdebugging-new/index.html
devtools/client/framework/components/DebugTargetInfo.js
devtools/client/framework/toolbox-init.js
devtools/client/framework/toolbox.xul
devtools/client/locales/en-US/toolbox.properties
--- a/devtools/client/aboutdebugging-new/index.html
+++ b/devtools/client/aboutdebugging-new/index.html
@@ -1,16 +1,15 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!DOCTYPE html>
 <html>
   <head>
     <meta charset="utf-8" />
     <title>Debugging</title>
-    <link rel="icon" type="image/png" href="chrome://browser/skin/developer.svg">
     <link rel="stylesheet" href="chrome://devtools/content/aboutdebugging-new/aboutdebugging.css"/>
     <script src="resource://devtools/client/aboutdebugging-new/initializer.js"></script>
   </head>
   <body>
     <div id="mount"></div>
   </body>
 </html>
--- a/devtools/client/framework/components/DebugTargetInfo.js
+++ b/devtools/client/framework/components/DebugTargetInfo.js
@@ -26,41 +26,16 @@ class DebugTargetInfo extends PureCompon
         }).isRequired,
         targetType: PropTypes.oneOf(Object.values(DEBUG_TARGET_TYPES)).isRequired,
       }).isRequired,
       L10N: PropTypes.object.isRequired,
       toolbox: PropTypes.object.isRequired,
     };
   }
 
-  componentDidMount() {
-    this.updateTitle();
-  }
-
-  updateTitle() {
-    const { L10N, debugTargetData, toolbox } = this.props;
-    const title = toolbox.target.name;
-    const targetTypeStr = L10N.getStr(this.getAssetsForDebugTargetType().l10nId);
-
-    const { connectionType } = debugTargetData;
-    if (connectionType === CONNECTION_TYPES.THIS_FIREFOX) {
-      toolbox.doc.title = L10N.getFormatStr("toolbox.debugTargetInfo.tabTitleLocal",
-        targetTypeStr,
-        title
-      );
-    } else {
-      const connectionTypeStr = L10N.getStr(this.getAssetsForConnectionType().l10nId);
-      toolbox.doc.title = L10N.getFormatStr("toolbox.debugTargetInfo.tabTitleRemote",
-        connectionTypeStr,
-        targetTypeStr,
-        title
-      );
-    }
-  }
-
   getRuntimeText() {
     const { debugTargetData, L10N } = this.props;
     const { brandName, version } = debugTargetData.deviceDescription;
     const { connectionType } = debugTargetData;
 
     return (connectionType === CONNECTION_TYPES.THIS_FIREFOX)
       ? L10N.getFormatStr("toolbox.debugTargetInfo.runtimeLabel.thisFirefox", version)
       : L10N.getFormatStr("toolbox.debugTargetInfo.runtimeLabel", brandName, version);
@@ -75,18 +50,16 @@ class DebugTargetInfo extends PureCompon
           image: "chrome://devtools/skin/images/aboutdebugging-usb-icon.svg",
           l10nId: "toolbox.debugTargetInfo.connection.usb",
         };
       case CONNECTION_TYPES.NETWORK:
         return {
           image: "chrome://devtools/skin/images/aboutdebugging-globe-icon.svg",
           l10nId: "toolbox.debugTargetInfo.connection.network",
         };
-      default:
-        return {};
     }
   }
 
   getAssetsForDebugTargetType() {
     const { targetType } = this.props.debugTargetData;
 
     // TODO: https://bugzilla.mozilla.org/show_bug.cgi?id=1520723
     //       Show actual favicon (currently toolbox.target.activeTab.favicon
@@ -109,18 +82,16 @@ class DebugTargetInfo extends PureCompon
           image: favicon,
           l10nId: "toolbox.debugTargetInfo.targetType.tab",
         };
       case DEBUG_TARGET_TYPES.WORKER:
         return {
           image: "chrome://devtools/skin/images/debugging-workers.svg",
           l10nId: "toolbox.debugTargetInfo.targetType.worker",
         };
-      default:
-        return {};
     }
   }
 
   shallRenderConnection() {
     const { connectionType } = this.props.debugTargetData;
     const renderableTypes = [
       CONNECTION_TYPES.USB,
       CONNECTION_TYPES.NETWORK,
--- a/devtools/client/framework/toolbox-init.js
+++ b/devtools/client/framework/toolbox-init.js
@@ -50,20 +50,16 @@ async function showErrorPage(doc, errorM
   const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
   const DebugTargetErrorPage = React.createFactory(
     require("devtools/client/framework/components/DebugTargetErrorPage"));
   const { LocalizationHelper } = browserRequire("devtools/shared/l10n");
   const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");
 
   // mount the React component into our XUL container once the DOM is ready
   await onLoad;
-
-  // Update the tab title.
-  document.title = L10N.getStr("toolbox.debugTargetInfo.tabTitleError");
-
   const mountEl = doc.querySelector("#toolbox-error-mount");
   const element = DebugTargetErrorPage({
     errorMessage,
     L10N,
   });
   ReactDOM.render(element, mountEl);
 
   // make sure we unmount the component when the page is destroyed
--- a/devtools/client/framework/toolbox.xul
+++ b/devtools/client/framework/toolbox.xul
@@ -12,17 +12,16 @@
 %toolboxDTD;
 <!ENTITY % globalKeysDTD SYSTEM "chrome://global/locale/globalKeys.dtd">
 %globalKeysDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <html:link href="chrome://browser/skin/window.svg" rel="shortcut icon"/>
   <script src="chrome://devtools/content/shared/theme-switching.js"/>
   <script src="chrome://global/content/viewSourceUtils.js"/>
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://devtools/content/framework/toolbox-init.js"/>
 
   <vbox id="toolbox-container" flex="1">
     <div xmlns="http://www.w3.org/1999/xhtml" id="toolbox-error-mount"/>
--- a/devtools/client/locales/en-US/toolbox.properties
+++ b/devtools/client/locales/en-US/toolbox.properties
@@ -225,34 +225,16 @@ toolbox.debugTargetInfo.runtimeLabel.thi
 # as a toolbox header in about:devtools-toolbox. about:devtools-toolbox is used for
 # instance when inspecting tabs in about:debugging.
 # e.g. Mozilla Fennec on Pixel 2 (65.0a1)
 # The name of runtime: %1$S
 # The version of runtime: %2$S
 # The device name of runtime: %3$S
 toolbox.debugTargetInfo.runtimeLabelWithDeviceName=%1$S on %3$S (%2$S)
 
-# LOCALIZATION NOTE (toolbox.debugTargetInfo.tabTitleRemote):
-# Used as the tab title for about:devtools-toolbox when connected to a remote target.
-# The connection type (see toolbox.debugTargetInfo.connection.*): %1$S
-# The target type (see toolbox.debugTargetInfo.targetType.*): %2$S
-# The target name (retrieved from DevTools, eg the extension's name): %3$S
-toolbox.debugTargetInfo.tabTitleRemote=Toolbox (%1$S) - %2$S / %3$S
-
-# LOCALIZATION NOTE (toolbox.debugTargetInfo.tabTitleLocal):
-# Used as the tab title for about:devtools-toolbox when connected to This Firefox.
-# The target type (see toolbox.debugTargetInfo.targetType.*): %1$S
-# The target name (retrieved from DevTools, eg the extension's name): %2$S
-toolbox.debugTargetInfo.tabTitleLocal=Toolbox - %1$S / %2$S
-
-# LOCALIZATION NOTE (toolbox.debugTargetInfo.tabTitleError):
-# Used as the tab title for about:devtools-toolbox when it failed to connect to the
-# target.
-toolbox.debugTargetInfo.tabTitleError=Toolbox - error occurred
-
 # LOCALIZATION NOTE (toolbox.debugTargetInfo.targetLabel): This is displayed as a toolbox
 # header in about:devtools-toolbox. about:devtools-toolbox is used for instance when
 # inspecting tabs in about:debugging.
 # e.g. Internet for people, not profit — Mozilla (tab)
 # The name of debug target: %1$S
 # The type of debug target: %2$S
 toolbox.debugTargetInfo.targetLabel=%1$S (%2$S)