From b7807c2f1e783ee5505751b63dd27c18d8ac1d34 Mon Sep 17 00:00:00 2001 From: Gurzau Raul Date: Tue, 24 Jul 2018 17:11:01 +0300 Subject: [PATCH] Backed out changeset 9162b1c01237 (bug 1452061) for failing at performance/components/test/test_jit_optimizations_01.html on a CLOSED TREE --HG-- rename : devtools/client/performance/components/JITOptimizationsItem.js => devtools/client/performance/components/jit-optimizations-item.js rename : devtools/client/performance/components/JITOptimizations.js => devtools/client/performance/components/jit-optimizations.js rename : devtools/client/performance/components/RecordingButton.js => devtools/client/performance/components/recording-button.js rename : devtools/client/performance/components/RecordingControls.js => devtools/client/performance/components/recording-controls.js rename : devtools/client/performance/components/RecordingListItem.js => devtools/client/performance/components/recording-list-item.js rename : devtools/client/performance/components/RecordingList.js => devtools/client/performance/components/recording-list.js rename : devtools/client/performance/components/WaterfallHeader.js => devtools/client/performance/components/waterfall-header.js rename : devtools/client/performance/components/WaterfallTreeRow.js => devtools/client/performance/components/waterfall-tree-row.js rename : devtools/client/performance/components/WaterfallTree.js => devtools/client/performance/components/waterfall-tree.js rename : devtools/client/performance/components/Waterfall.js => devtools/client/performance/components/waterfall.js --- ...tionsItem.js => jit-optimizations-item.js} | 0 ...TOptimizations.js => jit-optimizations.js} | 2 +- .../client/performance/components/moz.build | 20 +++++++++---------- ...RecordingButton.js => recording-button.js} | 0 ...rdingControls.js => recording-controls.js} | 0 ...dingListItem.js => recording-list-item.js} | 0 .../{RecordingList.js => recording-list.js} | 0 .../test/test_jit_optimizations_01.html | 2 +- ...WaterfallHeader.js => waterfall-header.js} | 0 ...erfallTreeRow.js => waterfall-tree-row.js} | 0 .../{WaterfallTree.js => waterfall-tree.js} | 2 +- .../components/{Waterfall.js => waterfall.js} | 4 ++-- .../performance/performance-controller.js | 12 +++++------ 13 files changed, 21 insertions(+), 21 deletions(-) rename devtools/client/performance/components/{JITOptimizationsItem.js => jit-optimizations-item.js} (100%) rename devtools/client/performance/components/{JITOptimizations.js => jit-optimizations.js} (99%) rename devtools/client/performance/components/{RecordingButton.js => recording-button.js} (100%) rename devtools/client/performance/components/{RecordingControls.js => recording-controls.js} (100%) rename devtools/client/performance/components/{RecordingListItem.js => recording-list-item.js} (100%) rename devtools/client/performance/components/{RecordingList.js => recording-list.js} (100%) rename devtools/client/performance/components/{WaterfallHeader.js => waterfall-header.js} (100%) rename devtools/client/performance/components/{WaterfallTreeRow.js => waterfall-tree-row.js} (100%) rename devtools/client/performance/components/{WaterfallTree.js => waterfall-tree.js} (98%) rename devtools/client/performance/components/{Waterfall.js => waterfall.js} (89%) diff --git a/devtools/client/performance/components/JITOptimizationsItem.js b/devtools/client/performance/components/jit-optimizations-item.js similarity index 100% rename from devtools/client/performance/components/JITOptimizationsItem.js rename to devtools/client/performance/components/jit-optimizations-item.js diff --git a/devtools/client/performance/components/JITOptimizations.js b/devtools/client/performance/components/jit-optimizations.js similarity index 99% rename from devtools/client/performance/components/JITOptimizations.js rename to devtools/client/performance/components/jit-optimizations.js index 4c89a63de6fa..82579afe5515 100644 --- a/devtools/client/performance/components/JITOptimizations.js +++ b/devtools/client/performance/components/jit-optimizations.js @@ -12,7 +12,7 @@ const { Component, createFactory } = require("devtools/client/shared/vendor/reac const dom = require("devtools/client/shared/vendor/react-dom-factories"); const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); const Tree = createFactory(require("devtools/client/shared/components/VirtualizedTree")); -const OptimizationsItem = createFactory(require("./JITOptimizationsItem")); +const OptimizationsItem = createFactory(require("./jit-optimizations-item")); const FrameView = createFactory(require("../../shared/components/Frame")); const JIT_TITLE = L10N.getStr("jit.title"); // If TREE_ROW_HEIGHT changes, be sure to change `var(--jit-tree-row-height)` diff --git a/devtools/client/performance/components/moz.build b/devtools/client/performance/components/moz.build index dfe9a1349645..55de592150eb 100644 --- a/devtools/client/performance/components/moz.build +++ b/devtools/client/performance/components/moz.build @@ -4,16 +4,16 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DevToolsModules( - 'JITOptimizations.js', - 'JITOptimizationsItem.js', - 'RecordingButton.js', - 'RecordingControls.js', - 'RecordingList.js', - 'RecordingListItem.js', - 'Waterfall.js', - 'WaterfallHeader.js', - 'WaterfallTree.js', - 'WaterfallTreeRow.js', + 'jit-optimizations-item.js', + 'jit-optimizations.js', + 'recording-button.js', + 'recording-controls.js', + 'recording-list-item.js', + 'recording-list.js', + 'waterfall-header.js', + 'waterfall-tree-row.js', + 'waterfall-tree.js', + 'waterfall.js', ) MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini'] diff --git a/devtools/client/performance/components/RecordingButton.js b/devtools/client/performance/components/recording-button.js similarity index 100% rename from devtools/client/performance/components/RecordingButton.js rename to devtools/client/performance/components/recording-button.js diff --git a/devtools/client/performance/components/RecordingControls.js b/devtools/client/performance/components/recording-controls.js similarity index 100% rename from devtools/client/performance/components/RecordingControls.js rename to devtools/client/performance/components/recording-controls.js diff --git a/devtools/client/performance/components/RecordingListItem.js b/devtools/client/performance/components/recording-list-item.js similarity index 100% rename from devtools/client/performance/components/RecordingListItem.js rename to devtools/client/performance/components/recording-list-item.js diff --git a/devtools/client/performance/components/RecordingList.js b/devtools/client/performance/components/recording-list.js similarity index 100% rename from devtools/client/performance/components/RecordingList.js rename to devtools/client/performance/components/recording-list.js diff --git a/devtools/client/performance/components/test/test_jit_optimizations_01.html b/devtools/client/performance/components/test/test_jit_optimizations_01.html index 3b6a7b54a07a..bc09d9845664 100644 --- a/devtools/client/performance/components/test/test_jit_optimizations_01.html +++ b/devtools/client/performance/components/test/test_jit_optimizations_01.html @@ -17,7 +17,7 @@ window.onload = async function () { try { let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom"); let React = browserRequire("devtools/client/shared/vendor/react"); - let JITOptimizations = React.createFactory(browserRequire("devtools/client/performance/components/JitOptimizations")); + let JITOptimizations = React.createFactory(browserRequire("devtools/client/performance/components/jit-optimizations")); ok(JITOptimizations, "Should get JITOptimizations"); let opts; diff --git a/devtools/client/performance/components/WaterfallHeader.js b/devtools/client/performance/components/waterfall-header.js similarity index 100% rename from devtools/client/performance/components/WaterfallHeader.js rename to devtools/client/performance/components/waterfall-header.js diff --git a/devtools/client/performance/components/WaterfallTreeRow.js b/devtools/client/performance/components/waterfall-tree-row.js similarity index 100% rename from devtools/client/performance/components/WaterfallTreeRow.js rename to devtools/client/performance/components/waterfall-tree-row.js diff --git a/devtools/client/performance/components/WaterfallTree.js b/devtools/client/performance/components/waterfall-tree.js similarity index 98% rename from devtools/client/performance/components/WaterfallTree.js rename to devtools/client/performance/components/waterfall-tree.js index 757f130ac023..d873ad35216b 100644 --- a/devtools/client/performance/components/WaterfallTree.js +++ b/devtools/client/performance/components/waterfall-tree.js @@ -6,7 +6,7 @@ const { Component, createFactory } = require("devtools/client/shared/vendor/react"); const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); const Tree = createFactory(require("devtools/client/shared/components/VirtualizedTree")); -const WaterfallTreeRow = createFactory(require("./WaterfallTreeRow")); +const WaterfallTreeRow = createFactory(require("./waterfall-tree-row")); // Keep in sync with var(--waterfall-tree-row-height) in performance.css const WATERFALL_TREE_ROW_HEIGHT = 15; // px diff --git a/devtools/client/performance/components/Waterfall.js b/devtools/client/performance/components/waterfall.js similarity index 89% rename from devtools/client/performance/components/Waterfall.js rename to devtools/client/performance/components/waterfall.js index 9961a4f1ceb5..0f0ab9602e24 100644 --- a/devtools/client/performance/components/Waterfall.js +++ b/devtools/client/performance/components/waterfall.js @@ -11,8 +11,8 @@ const { createFactory } = require("devtools/client/shared/vendor/react"); const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); const dom = require("devtools/client/shared/vendor/react-dom-factories"); -const WaterfallHeader = createFactory(require("./WaterfallHeader")); -const WaterfallTree = createFactory(require("./WaterfallTree")); +const WaterfallHeader = createFactory(require("./waterfall-header")); +const WaterfallTree = createFactory(require("./waterfall-tree")); function Waterfall(props) { return dom.div( diff --git a/devtools/client/performance/performance-controller.js b/devtools/client/performance/performance-controller.js index 983d4457a479..c71311feb31a 100644 --- a/devtools/client/performance/performance-controller.js +++ b/devtools/client/performance/performance-controller.js @@ -34,12 +34,12 @@ Object.defineProperty(this, "EVENTS", { DevToolsUtils, system */ var React = require("devtools/client/shared/vendor/react"); var ReactDOM = require("devtools/client/shared/vendor/react-dom"); -var Waterfall = React.createFactory(require("devtools/client/performance/components/Waterfall")); -var JITOptimizationsView = React.createFactory(require("devtools/client/performance/components/JITOptimizations")); -var RecordingControls = React.createFactory(require("devtools/client/performance/components/RecordingControls")); -var RecordingButton = React.createFactory(require("devtools/client/performance/components/RecordingButton")); -var RecordingList = React.createFactory(require("devtools/client/performance/components/RecordingList")); -var RecordingListItem = React.createFactory(require("devtools/client/performance/components/RecordingListItem")); +var Waterfall = React.createFactory(require("devtools/client/performance/components/waterfall")); +var JITOptimizationsView = React.createFactory(require("devtools/client/performance/components/jit-optimizations")); +var RecordingControls = React.createFactory(require("devtools/client/performance/components/recording-controls")); +var RecordingButton = React.createFactory(require("devtools/client/performance/components/recording-button")); +var RecordingList = React.createFactory(require("devtools/client/performance/components/recording-list")); +var RecordingListItem = React.createFactory(require("devtools/client/performance/components/recording-list-item")); var Services = require("Services"); var promise = require("promise");