Backed out changeset e7b9263ae9f1 (bug 1308227) for browser_parsable_css.js failures a=backout
authorWes Kocher <wkocher@mozilla.com>
Fri, 14 Oct 2016 14:55:50 -0700
changeset 318085 6ed5592738b6c40ea8aefcf8b699de9f60f30a91
parent 318084 9696d132b1691d15ff845550d13ef9a6cfc78049
child 318086 45f9fc18cf3dab70ba8d1982f40fea9246ae60b9
push id33211
push usercbook@mozilla.com
push dateMon, 17 Oct 2016 09:38:38 +0000
treeherderautoland@e4ef6fa03aa8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1308227
milestone52.0a1
backs oute7b9263ae9f1356fa228c14b806db2509723b64a
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 changeset e7b9263ae9f1 (bug 1308227) for browser_parsable_css.js failures a=backout
devtools/client/inspector/inspector.xhtml
devtools/client/inspector/layout/components/Accordion.css
devtools/client/inspector/layout/components/Accordion.js
devtools/client/inspector/layout/components/App.js
devtools/client/inspector/layout/components/Grid.js
devtools/client/inspector/layout/components/moz.build
devtools/client/inspector/layout/layout.js
devtools/client/inspector/layout/moz.build
devtools/client/inspector/layout/utils/l10n.js
devtools/client/inspector/layout/utils/moz.build
devtools/client/jar.mn
devtools/client/locales/en-US/layout.properties
devtools/client/shared/components/tabs/tabbar.css
devtools/client/themes/inspector.css
devtools/client/themes/layout.css
--- a/devtools/client/inspector/inspector.xhtml
+++ b/devtools/client/inspector/inspector.xhtml
@@ -5,25 +5,23 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/inspector.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/rules.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/computed.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/fonts.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/boxmodel.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/layout.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/animationinspector.css" type="text/css"?>
 <?xml-stylesheet href="resource://devtools/client/shared/components/sidebar-toggle.css" type="text/css"?>
-<?xml-stylesheet href="resource://devtools/client/shared/components/splitter/split-box.css" type="text/css"?>
 <?xml-stylesheet href="resource://devtools/client/shared/components/tabs/tabs.css" type="text/css"?>
 <?xml-stylesheet href="resource://devtools/client/shared/components/tabs/tabbar.css" type="text/css"?>
+<?xml-stylesheet href="resource://devtools/client/inspector/components/side-panel.css" type="text/css"?>
 <?xml-stylesheet href="resource://devtools/client/inspector/components/inspector-tab-panel.css" type="text/css"?>
-<?xml-stylesheet href="resource://devtools/client/inspector/components/side-panel.css" type="text/css"?>
-<?xml-stylesheet href="resource://devtools/client/inspector/layout/components/Accordion.css" type="text/css"?>
+<?xml-stylesheet href="resource://devtools/client/shared/components/splitter/split-box.css" type="text/css"?>
 
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml" dir="">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <script type="application/javascript;version=1.8"
           src="chrome://devtools/content/shared/theme-switching.js"></script>
@@ -183,17 +181,17 @@
 
             <div id="computedview-no-results" hidden="" data-localization="content=inspector.noProperties"/>
           </div>
         </div>
       </div>
 
       <div id="sidebar-panel-layoutview" class="devtools-monospace theme-sidebar inspector-tabpanel"
            data-localization-bundle="devtools/locale/inspector.properties">
-        <div id="layoutview-container"></div>
+        <div id="layout-root"></div>
       </div>
 
       <div id="sidebar-panel-fontinspector" class="devtools-monospace theme-sidebar inspector-tabpanel"
                 data-localization-bundle="devtools/locale/font-inspector.properties">
         <div class="devtools-toolbar">
           <div class="devtools-searchbox">
             <input id="font-preview-text-input" class="devtools-textinput" type="search"
                         data-localization="placeholder=fontinspector.previewText"/>
deleted file mode 100644
--- a/devtools/client/inspector/layout/components/Accordion.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/* 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/. */
-
-/**
- * This file should not be modified and is a duplicate from the debugger.html project.
- * Any changes to this file should be imported from the upstream debugger.html project.
- */
-
-.accordion {
-  background-color: var(--theme-body-background);
-  width: 100%;
-}
-
-.accordion ._header {
-  background-color: var(--theme-toolbar-background);
-  border-bottom: 1px solid var(--theme-splitter-color);
-  cursor: pointer;
-  font-size: 11px;
-  padding: 5px;
-  transition: all 0.25s ease;
-  width: 100%;
-
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  -o-user-select: none;
-  user-select: none;
-}
-
-.accordion ._header:hover {
-  background-color: var(--theme-selection-color);
-}
-
-.accordion ._header:hover svg {
-  fill: var(--theme-comment-alt);
-}
-
-.accordion ._content {
-  border-bottom: 1px solid var(--theme-splitter-color);
-  font-size: 11px;
-}
-
-.arrow {
-  vertical-align: middle;
-  display: inline-block;
-}
deleted file mode 100644
--- a/devtools/client/inspector/layout/components/Accordion.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/* 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/. */
-
-/**
- * This file should not be modified and is a duplicate from the debugger.html project.
- * Any changes to this file should be imported from the upstream debugger.html project.
- */
-
-"use strict";
-
-const React = require("devtools/client/shared/vendor/react");
-const { DOM: dom, PropTypes } = React;
-
-const { div, span } = dom;
-
-const Accordion = React.createClass({
-  displayName: "Accordion",
-
-  propTypes: {
-    items: PropTypes.array
-  },
-
-  getInitialState: function () {
-    return { opened: this.props.items.map(item => item.opened),
-             created: [] };
-  },
-
-  handleHeaderClick: function (i) {
-    const opened = [...this.state.opened];
-    const created = [...this.state.created];
-    const item = this.props.items[i];
-
-    opened[i] = !opened[i];
-    created[i] = true;
-
-    if (opened[i] && item.onOpened) {
-      item.onOpened();
-    }
-
-    this.setState({ opened, created });
-  },
-
-  renderContainer: function (item, i) {
-    const { opened, created } = this.state;
-    const containerClassName =
-          item.header.toLowerCase().replace(/\s/g, "-") + "-pane";
-    let arrowClassName = "arrow theme-twisty";
-    if (opened[i]) {
-      arrowClassName += " open";
-    }
-
-    return div(
-      { className: containerClassName, key: i },
-
-      div(
-        { className: "_header",
-          onClick: () => this.handleHeaderClick(i) },
-        span({ className: arrowClassName }),
-        item.header
-      ),
-
-      (created[i] || opened[i]) ?
-        div(
-          { className: "_content",
-              style: { display: opened[i] ? "block" : "none" }
-          },
-          React.createElement(item.component, item.componentProps || {})
-        ) :
-        null
-    );
-  },
-
-  render: function () {
-    return div(
-      { className: "accordion" },
-      this.props.items.map(this.renderContainer)
-    );
-  }
-});
-
-module.exports = Accordion;
--- a/devtools/client/inspector/layout/components/App.js
+++ b/devtools/client/inspector/layout/components/App.js
@@ -1,35 +1,24 @@
 /* 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 { getStr } = require("../utils/l10n");
-const { DOM: dom, createClass, createFactory } = require("devtools/client/shared/vendor/react");
+const { createClass, DOM: dom } = require("devtools/client/shared/vendor/react");
 const { connect } = require("devtools/client/shared/vendor/react-redux");
 
-const Accordion = createFactory(require("./Accordion"));
-const Grid = createFactory(require("./Grid"));
-
-const App = createClass({
+let App = createClass({
 
   displayName: "App",
 
   render() {
     return dom.div(
       {
-        id: "layoutview-container-focusable",
-      },
-      Accordion({
-        items: [
-          { header: getStr("layout.header"),
-            component: Grid,
-            opened: true }
-        ]
-      })
+        id: "app",
+      }
     );
   },
 
 });
 
 module.exports = connect(state => state)(App);
deleted file mode 100644
--- a/devtools/client/inspector/layout/components/Grid.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* 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 { getStr } = require("../utils/l10n");
-const { DOM: dom, createClass } = require("devtools/client/shared/vendor/react");
-
-const Grid = createClass({
-
-  displayName: "Grid",
-
-  render() {
-    return dom.div(
-      {
-        id: "layoutview-grid-container",
-      },
-      dom.div(
-        {
-          className: "layoutview-no-grids"
-        },
-        getStr("layout.noGrids")
-      )
-    );
-  },
-
-});
-
-module.exports = Grid;
--- a/devtools/client/inspector/layout/components/moz.build
+++ b/devtools/client/inspector/layout/components/moz.build
@@ -1,12 +1,9 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 DevToolsModules(
-    'Accordion.css',
-    'Accordion.js',
     'App.js',
-    'Grid.js',
 )
--- a/devtools/client/inspector/layout/layout.js
+++ b/devtools/client/inspector/layout/layout.js
@@ -18,17 +18,17 @@ LayoutViewTool.prototype = {
     const { React, ReactDOM, ReactRedux, browserRequire } = this.inspector;
 
     const Store = browserRequire("devtools/client/inspector/layout/store");
     const App = React.createFactory(
       browserRequire("devtools/client/inspector/layout/components/App"));
 
     let store = this.store = Store();
     let provider = React.createElement(ReactRedux.Provider, { store }, App());
-    ReactDOM.render(provider, this.document.querySelector("#layoutview-container"));
+    ReactDOM.render(provider, this.document.querySelector("#layout-root"));
   },
 
   destroy() {
     this.inspector = null;
     this.document = null;
     this.store = null;
   },
 
--- a/devtools/client/inspector/layout/moz.build
+++ b/devtools/client/inspector/layout/moz.build
@@ -3,16 +3,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/.
 
 DIRS += [
     'actions',
     'components',
     'reducers',
-    'utils',
 ]
 
 DevToolsModules(
     'layout.js',
     'store.js',
     'types.js',
 )
deleted file mode 100644
--- a/devtools/client/inspector/layout/utils/l10n.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/* 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 { LocalizationHelper } = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/layout.properties");
-
-module.exports = {
-  getStr: (...args) => L10N.getStr(...args),
-  getFormatStr: (...args) => L10N.getFormatStr(...args),
-  getFormatStrWithNumbers: (...args) => L10N.getFormatStrWithNumbers(...args),
-  numberWithDecimals: (...args) => L10N.numberWithDecimals(...args),
-};
deleted file mode 100644
--- a/devtools/client/inspector/layout/utils/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-DevToolsModules(
-    'l10n.js',
-)
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -294,17 +294,16 @@ devtools.jar:
     skin/images/vview-lock@2x.png (themes/images/vview-lock@2x.png)
     skin/images/vview-open-inspector.png (themes/images/vview-open-inspector.png)
     skin/images/vview-open-inspector@2x.png (themes/images/vview-open-inspector@2x.png)
     skin/images/sort-arrows.svg (themes/images/sort-arrows.svg)
     skin/images/cubic-bezier-swatch.png (themes/images/cubic-bezier-swatch.png)
     skin/images/cubic-bezier-swatch@2x.png (themes/images/cubic-bezier-swatch@2x.png)
     skin/fonts.css (themes/fonts.css)
     skin/computed.css (themes/computed.css)
-    skin/layout.css (themes/layout.css)
     skin/images/arrow-e.png (themes/images/arrow-e.png)
     skin/images/arrow-e@2x.png (themes/images/arrow-e@2x.png)
     skin/projecteditor/projecteditor.css (themes/projecteditor/projecteditor.css)
     skin/images/search-clear-failed.svg (themes/images/search-clear-failed.svg)
     skin/images/search-clear-light.svg (themes/images/search-clear-light.svg)
     skin/images/search-clear-dark.svg (themes/images/search-clear-dark.svg)
     skin/tooltip/arrow-horizontal-dark.png (themes/tooltip/arrow-horizontal-dark.png)
     skin/tooltip/arrow-horizontal-dark@2x.png (themes/tooltip/arrow-horizontal-dark@2x.png)
deleted file mode 100644
--- a/devtools/client/locales/en-US/layout.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/.
-
-# LOCALIZATION NOTE This file contains the Layout Inspector strings.
-# The Layout Inspector is a panel accessible in the Inspector sidebar.
-# The Layout Inspector may need to be enabled in about:config by setting
-# devtools.layoutview.enabled to true.
-
-# LOCALIZATION NOTE (layout.header): The accordion header for the CSS Grid pane.
-layout.header=Grid
-
-# LOCALIZATION NOTE (layout.noGrids): In the case where there are no CSS grid
-# containers to display.
-layout.noGrids=No grids
--- a/devtools/client/shared/components/tabs/tabbar.css
+++ b/devtools/client/shared/components/tabs/tabbar.css
@@ -3,17 +3,17 @@
  * 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/. */
 
 .tabs .tabs-navigation {
   line-height: 15px;
 }
 
 .tabs .tabs-navigation {
-  height: 24px;
+  height: 23px;
 }
 
 .tabs .tabs-menu-item:first-child {
   border-inline-start-width: 0;
 }
 
 .tabs .tabs-navigation .tabs-menu-item:focus {
   outline: var(--theme-focus-outline);
--- a/devtools/client/themes/inspector.css
+++ b/devtools/client/themes/inspector.css
@@ -14,20 +14,16 @@
 :root.theme-light {
   --breadcrumbs-border-color: #f3f3f3;
 }
 
 :root.theme-dark {
   --breadcrumbs-border-color: #454d5d;
 }
 
-* {
-  box-sizing: border-box;
-}
-
 /* Make sure to hide scroll bars for the parent window */
 window {
   overflow: hidden;
 }
 
 /* The main Inspector panel container. */
 .inspector-responsive-container {
   height: 100vh;
deleted file mode 100644
--- a/devtools/client/themes/layout.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/* 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/. */
-
-#sidebar-panel-layoutview {
-  margin: 0;
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-}
-
-#layoutview-container {
-  height: 100%;
-  overflow: auto;
-}
-
-#layoutview-container-focusable {
-  height: 100%;
-  outline: none;
-}
-
-.layoutview-no-grids {
-  font-style: italic;
-  text-align: center;
-  padding: 0.5em;
-}