Bug 1163268 - Remove UI options for recording with memory and jit optimizations. r=vp
authorJordan Santell <jsantell@mozilla.com>
Sat, 09 May 2015 16:05:59 -0700
changeset 274546 2cc54ae7afa57fa286260fcde5fb08c3e43a7971
parent 274545 e8362616653bb51c1fd7b4c3123033112448f979
child 274547 1fcc6c6ddf0fec244088c05c0b3f028b66847d72
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvp
bugs1163268
milestone40.0a1
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
Bug 1163268 - Remove UI options for recording with memory and jit optimizations. r=vp
browser/devtools/performance/performance.xul
browser/devtools/performance/views/toolbar.js
--- a/browser/devtools/performance/performance.xul
+++ b/browser/devtools/performance/performance.xul
@@ -32,21 +32,22 @@
   <popupset id="performance-options-popupset">
     <menupopup id="performance-filter-menupopup"/>
     <menupopup id="performance-options-menupopup">
       <menuitem id="option-show-platform-data"
                 type="checkbox"
                 data-pref="show-platform-data"
                 label="&profilerUI.showPlatformData;"
                 tooltiptext="&profilerUI.showPlatformData.tooltiptext;"/>
-      <menuitem id="option-enable-memory"
+      <!-- TODO Re-enable in bug 1163350 -->
+      <!-- <menuitem id="option-enable-memory"
                 type="checkbox"
                 data-pref="enable-memory"
                 label="&profilerUI.enableMemory;"
-                tooltiptext="&profilerUI.enableMemory.tooltiptext;"/>
+                tooltiptext="&profilerUI.enableMemory.tooltiptext;"/> -->
       <menuitem id="option-enable-framerate"
                 type="checkbox"
                 data-pref="enable-framerate"
                 label="&profilerUI.enableFramerate;"
                 tooltiptext="&profilerUI.enableFramerate.tooltiptext;"/>
       <menuitem id="option-invert-call-tree"
                 type="checkbox"
                 data-pref="invert-call-tree"
@@ -57,21 +58,22 @@
                 data-pref="invert-flame-graph"
                 label="&profilerUI.invertFlameGraph;"
                 tooltiptext="&profilerUI.invertFlameGraph.tooltiptext;"/>
       <menuitem id="option-flatten-tree-recursion"
                 type="checkbox"
                 data-pref="flatten-tree-recursion"
                 label="&profilerUI.flattenTreeRecursion;"
                 tooltiptext="&profilerUI.flattenTreeRecursion.tooltiptext;"/>
-      <menuitem id="option-show-jit-optimizations"
+      <!-- TODO Re-enable in bug 1163351 -->
+      <!-- <menuitem id="option-show-jit-optimizations"
                 type="checkbox"
                 data-pref="show-jit-optimizations"
                 label="&profilerUI.showJITOptimizations;"
-                tooltiptext="&profilerUI.showJITOptimizations.tooltiptext;"/>
+                tooltiptext="&profilerUI.showJITOptimizations.tooltiptext;"/> -->
     </menupopup>
   </popupset>
 
   <hbox class="theme-body" flex="1">
     <vbox id="recordings-pane">
       <toolbar id="recordings-toolbar"
                class="devtools-toolbar">
         <hbox id="recordings-controls"
--- a/browser/devtools/performance/views/toolbar.js
+++ b/browser/devtools/performance/views/toolbar.js
@@ -21,18 +21,23 @@ let ToolbarView = {
       menupopup: $("#performance-options-menupopup")
     });
 
     // TODO bug 1160313 get rid of retro mode checks
     // hide option buttons here, and any other buttons in the toolbar
     // (details.js takes care of view buttons)
     if (PerformanceController.getOption("retro-mode")) {
       let RETRO_ELEMENTS = [
-        "#option-flatten-tree-recursion", "#option-enable-memory", "#option-invert-flame-graph",
-        "#option-show-jit-optimizations", "#filter-button"
+        "#option-flatten-tree-recursion",
+        "#option-invert-flame-graph",
+        "#filter-button",
+        // TODO re-enable in bug 1163350
+        // "#option-enable-memory",
+        // TODO re-enable in bug 1163351
+        // "#option-show-jit-optimizations",
       ];
       for (let selector of RETRO_ELEMENTS) {
         $(selector).hidden = true;
       }
     }
 
     yield this.optionsView.initialize();
     this.optionsView.on("pref-changed", this._onPrefChanged);