Backed out 3 changesets (bug 1482454) for devtools failures CLOSED TREES
authorNoemi Erli <nerli@mozilla.com>
Fri, 17 Aug 2018 19:52:01 +0300
changeset 432136 7800cf98a6e7d80dbd8cb3c66fdc06020e303c44
parent 432135 2fd1f2dc72cb3581810a1fb1478775b91db79239
child 432137 4b9dcf8f2e6c1b9b295193d13647664f6cee3d07
child 432201 a75079e6f2345d2cad5623b3973a731c431dec19
push id106650
push usernerli@mozilla.com
push dateFri, 17 Aug 2018 16:52:14 +0000
treeherdermozilla-inbound@7800cf98a6e7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1482454
milestone63.0a1
backs out3ada76566234066a9adf2cc1daf8b52121dea27b
1cdd772dae68706d8359c4aae5b5316981f6ce44
f06260e3db1c62e7e24845fb4d92a6d7c6093427
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 1482454) for devtools failures CLOSED TREES Backed out changeset 3ada76566234 (bug 1482454) Backed out changeset 1cdd772dae68 (bug 1482454) Backed out changeset f06260e3db1c (bug 1482454)
devtools/client/accessibility/accessibility-startup.js
devtools/client/accessibility/accessibility.css
devtools/client/accessibility/panel.js
devtools/client/definitions.js
devtools/client/framework/components/ToolboxTab.js
devtools/client/framework/toolbox-process-window.js
devtools/client/inspector/inspector.js
devtools/client/locales/en-US/startup.properties
devtools/client/preferences/devtools-client.js
devtools/client/themes/toolbox.css
--- a/devtools/client/accessibility/accessibility-startup.js
+++ b/devtools/client/accessibility/accessibility-startup.js
@@ -1,20 +1,16 @@
 /* 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/. */
 
 "use strict";
 
-const Services = require("Services");
 const { AccessibilityFront } = require("devtools/shared/fronts/accessibility");
 
-// @remove after release 63 (See Bug 1482461)
-const PROMOTE_COUNT_PREF = "devtools.promote.accessibility";
-
 /**
  * Component responsible for all accessibility panel startup steps before the panel is
  * actually opened.
  */
 class AccessibilityStartup {
   constructor(toolbox) {
     this.toolbox = toolbox;
 
@@ -128,20 +124,15 @@ class AccessibilityStartup {
   _updateAccessibilityToolHighlight() {
     if (this._accessibility.enabled) {
       this.toolbox.highlightTool("accessibility");
     } else {
       this.toolbox.unhighlightTool("accessibility");
     }
   }
 
-  // @remove after release 63 (See Bug 1482461)
-  updatePanelPromoteCount() {
-    Services.prefs.setIntPref(PROMOTE_COUNT_PREF, 0);
-  }
-
   async destroy() {
     await this.destroyAccessibility();
     this.toolbox = null;
   }
 }
 
 exports.AccessibilityStartup = AccessibilityStartup;
--- a/devtools/client/accessibility/accessibility.css
+++ b/devtools/client/accessibility/accessibility.css
@@ -7,23 +7,16 @@
   --accessibility-toolbar-height: 24px;
   --accessibility-toolbar-height-tall: 35px;
   --accessibility-toolbar-focus: var(--blue-50);
   --accessibility-toolbar-focus-alpha30: rgba(10, 132, 255, 0.3);
   --accessibility-full-length-minus-splitter: calc(100% - 1px);
   --accessibility-horizontal-padding: 5px;
   --accessibility-arrow-horizontal-padding: 4px;
   --accessibility-tree-row-height: 21px;
-  --accessibility-unfocused-tree-focused-node-background: var(--grey-20);
-  --accessibility-tree-focused-node-twisty-brightness: brightness(20%);
-}
-
-:root.theme-dark {
-  --accessibility-unfocused-tree-focused-node-background: var(--grey-70);
-  --accessibility-tree-focused-node-twisty-brightness: unset;
 }
 
 /* General */
 html,
 body {
   height: 100%;
   margin: 0;
   padding: 0;
@@ -157,31 +150,19 @@ body {
   outline: 0;
 }
 
 .treeTable::-moz-focus-inner,
 .treeTable > tbody::-moz-focus-inner {
   border: 0;
 }
 
-.treeTable:not(:focus) tbody:not(:focus) .treeRow.selected {
-  background-color: var(--accessibility-unfocused-tree-focused-node-background);
-}
-
-.treeTable:not(:focus) tbody:not(:focus) .treeRow.selected .theme-twisty {
-  filter: var(--accessibility-tree-focused-node-twisty-brightness);
-}
-
-.treeTable:not(:focus) tbody:not(:focus) .treeRow.selected *,
-.treeTable:not(:focus) tbody:not(:focus) .treeRow.selected .treeLabelCell:after {
-  color: inherit;
-}
-
-.treeTable:not(:focus) tbody:not(:focus) .treeRow.selected .objectBox-string {
-  color: var(--string-color);
+.treeTable:focus > tbody {
+  outline: var(--theme-focus-outline);
+  outline-offset: -1px;
 }
 
 .treeTable > thead {
   pointer-events: none;
 }
 
 .treeTable > tbody tr {
   height: var(--accessibility-tree-row-height);
@@ -274,54 +255,33 @@ body {
   position: relative;
   display: flex;
   height: var(--accessibility-tree-row-height);
   width: calc(100% - var(--accessibility-horizontal-padding));
   cursor: default;
   align-items: center;
 }
 
-.accessible .tree:focus {
-  outline: 0;
-}
-
-.accessible .tree::-moz-focus-inner {
-  border: 0;
+.accessible .tree .node.focused {
+  background-color: var(--theme-selection-background);
 }
 
-/* Unset tree styles leaking from reps.css */
-.accessible .tree .tree-node:not(.focused):hover {
-  background-color: transparent;
-}
-
-.accessible .tree:not(:focus) .node.focused {
-  background-color: var(--accessibility-unfocused-tree-focused-node-background);
-}
-
-.accessible .tree:not(:focus) .node.focused .theme-twisty {
-  filter: var(--accessibility-tree-focused-node-twisty-brightness);
-}
-
-.accessible .tree .node:not(.focused):hover {
+.accessible .tree .tree-node:hover:not(.focused) {
   background-color: var(--theme-selection-background-hover);
 }
 
-.accessible .tree:focus .node.focused {
-  background-color: var(--theme-selection-background);
-}
-
-.accessible .tree:focus .node.focused * {
+.accessible .tree .node.focused * {
   color: var(--theme-selection-color);
 }
 
-.accessible .tree:focus .node.focused .open-inspector {
+.accessible .tree .node.focused .open-inspector {
   background-color: var(--grey-30);
 }
 
-.accessible .tree:focus .node.focused:hover .open-inspector {
+.accessible .tree .node.focused:hover .open-inspector {
   background-color: var(--theme-selection-color);
 }
 
 .accessible .tree .arrow {
   flex-shrink: 0;
 }
 
 .accessible .tree .object-value {
--- a/devtools/client/accessibility/panel.js
+++ b/devtools/client/accessibility/panel.js
@@ -81,18 +81,16 @@ AccessibilityPanel.prototype = {
     this.panelWin.gToolbox = this._toolbox;
 
     await this._toolbox.initInspector();
     await this.startup.initAccessibility();
     if (this.supportsLatestAccessibility) {
       this.picker = new Picker(this);
     }
 
-    this.startup.updatePanelPromoteCount();
-
     this.updateA11YServiceDurationTimer();
     this.front.on("init", this.updateA11YServiceDurationTimer);
     this.front.on("shutdown", this.updateA11YServiceDurationTimer);
 
     this.isReady = true;
     this.emit("ready");
     resolver(this);
     return this._opening;
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -460,25 +460,16 @@ Tools.accessibility = {
 
   build(iframeWindow, toolbox) {
     const startup = toolbox.getToolStartup("accessibility");
     return new AccessibilityPanel(iframeWindow, toolbox, startup);
   },
 
   buildToolStartup(toolbox) {
     return new AccessibilityStartup(toolbox);
-  },
-
-  // @remove after release 63 (See Bug 1482461)
-  get badge() {
-    if (Services.prefs.getIntPref("devtools.promote.accessibility") > 0) {
-      return l10n("toolbox.tab.newBadge");
-    }
-
-    return null;
   }
 };
 
 Tools.application = {
   id: "application",
   ordinal: 15,
   visibilityswitch: "devtools.application.enabled",
   icon: "chrome://devtools/skin/images/tool-application.svg",
--- a/devtools/client/framework/components/ToolboxTab.js
+++ b/devtools/client/framework/components/ToolboxTab.js
@@ -36,17 +36,17 @@ class ToolboxTab extends Component {
         src: icon
       }),
     ];
   }
 
   render() {
     const {panelDefinition, currentToolId, highlightedTools, selectTool,
            focusedButton, focusButton} = this.props;
-    const {id, extensionId, tooltip, label, iconOnly, badge} = panelDefinition;
+    const {id, extensionId, tooltip, label, iconOnly} = panelDefinition;
     const isHighlighted = id === currentToolId;
 
     const className = [
       "devtools-tab",
       currentToolId === id ? "selected" : "",
       highlightedTools.has(id) ? "highlighted" : "",
       iconOnly ? "devtools-tab-icon-only" : ""
     ].join(" ");
@@ -76,23 +76,15 @@ class ToolboxTab extends Component {
       ),
       ...this.renderIcon(panelDefinition, isHighlighted),
       iconOnly ?
         null :
         span(
           {
             className: "devtools-tab-label"
           },
-          label,
-          badge && !isHighlighted ?
-            span(
-              {
-                className: "devtools-tab-badge"
-              },
-              badge
-            ) :
-            null
+          label
         )
     );
   }
 }
 
 module.exports = ToolboxTab;
--- a/devtools/client/framework/toolbox-process-window.js
+++ b/devtools/client/framework/toolbox-process-window.js
@@ -99,16 +99,17 @@ function setPrefDefaults() {
   Services.prefs.setBoolPref("browser.dom.window.dump.enabled", true);
   Services.prefs.setBoolPref("devtools.command-button-noautohide.enabled", true);
   // Bug 1225160 - Using source maps with browser debugging can lead to a crash
   Services.prefs.setBoolPref("devtools.debugger.source-maps-enabled", false);
   Services.prefs.setBoolPref("devtools.debugger.new-debugger-frontend", true);
   Services.prefs.setBoolPref("devtools.preference.new-panel-enabled", false);
   Services.prefs.setBoolPref("layout.css.emulate-moz-box-with-flex", false);
 
+  Services.prefs.setBoolPref("devtools.accessibility.enabled", true);
   Services.prefs.setBoolPref("devtools.performance.enabled", false);
 }
 
 window.addEventListener("load", async function() {
   const cmdClose = document.getElementById("toolbox-cmd-close");
   cmdClose.addEventListener("command", onCloseCommand);
   setPrefDefaults();
   // Reveal status message if connecting is slow or if an error occurs.
--- a/devtools/client/inspector/inspector.js
+++ b/devtools/client/inspector/inspector.js
@@ -1692,23 +1692,17 @@ Inspector.prototype = {
     }
 
     const showA11YPropsItem = new MenuItem({
       id: "node-menu-showaccessibilityproperties",
       label: INSPECTOR_L10N.getStr("inspectorShowAccessibilityProperties.label"),
       click: () => this.showAccessibilityProperties(),
       disabled: true
     });
-    // Accessibility startup component maintains accessibilityFront that is up-to-date
-    // with the state of the accessibility service on the server side.
-    const startup = this._toolbox.getToolStartup("accessibility");
-    if (startup && startup.accessibility.enabled) {
-      this._updateA11YMenuItem(showA11YPropsItem);
-    }
-
+    this._updateA11YMenuItem(showA11YPropsItem);
     menu.append(showA11YPropsItem);
   },
 
   _updateA11YMenuItem: async function(menuItem) {
     const hasMethod = await this.target.actorHasMethod("domwalker",
                                                        "hasAccessibilityProperties");
     if (!hasMethod) {
       return;
--- a/devtools/client/locales/en-US/startup.properties
+++ b/devtools/client/locales/en-US/startup.properties
@@ -307,13 +307,8 @@ toolbox.buttons.screenshot = Take a scre
 # This is the tooltip of the button in the toolbox toolbar that toggles the
 # rulers in the page
 toolbox.buttons.rulers = Toggle rulers for the page
 
 # LOCALIZATION NOTE (toolbox.buttons.measure):
 # This is the tooltip of the button in the toolbox toolbar that toggles the
 # measuring tools
 toolbox.buttons.measure = Measure a portion of the page
-
-# LOCALIZATION NOTE (toolbox.tab.newBadge):
-# This is the text of a promotion badge showed in the toobox tab bar, next to a tab panel
-# name. Used to promote new/recent panels such as the accessibility panel.
-toolbox.tab.newBadge=New
--- a/devtools/client/preferences/devtools-client.js
+++ b/devtools/client/preferences/devtools-client.js
@@ -223,20 +223,17 @@ pref("devtools.webaudioeditor.enabled", 
 
 // Enable Scratchpad
 pref("devtools.scratchpad.enabled", false);
 
 // Make sure the DOM panel is hidden by default
 pref("devtools.dom.enabled", false);
 
 // Make sure the Accessibility panel is hidden by default
-pref("devtools.accessibility.enabled", true);
-// Counter to promote the Accessibility panel.
-// @remove after release 63 (See Bug 1482461)
-pref("devtools.promote.accessibility", 1);
+pref("devtools.accessibility.enabled", false);
 
 // Web Audio Editor Inspector Width should be a preference
 pref("devtools.webaudioeditor.inspectorWidth", 300);
 
 // Web console filters
 pref("devtools.webconsole.filter.error", true);
 pref("devtools.webconsole.filter.warn", true);
 pref("devtools.webconsole.filter.info", true);
--- a/devtools/client/themes/toolbox.css
+++ b/devtools/client/themes/toolbox.css
@@ -114,23 +114,16 @@
   padding-inline-end: 10px;
   min-width: 1px;
 }
 
 .devtools-tab-label:-moz-locale-dir(rtl) {
   mask-image: linear-gradient(to right, transparent 0, black 6px);
 }
 
-.devtools-tab .devtools-tab-badge {
-  color: var(--theme-highlight-blue);
-  font-size: 80%;
-  font-weight: 500;
-  margin-inline-start: 5px;
-}
-
 .devtools-tab-icon-only {
   min-width: 24px;
 }
 
 .devtools-tab {
   color: var(--theme-toolbar-color);
 }