diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 93e3f8b93657..2d55e3b3f3e9 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1461,6 +1461,7 @@ pref("devtools.performance.ui.flatten-tree-recursion", true); pref("devtools.performance.ui.show-platform-data", false); pref("devtools.performance.ui.show-idle-blocks", true); pref("devtools.performance.ui.enable-memory", false); +pref("devtools.performance.ui.enable-allocations", false); pref("devtools.performance.ui.enable-framerate", true); pref("devtools.performance.ui.show-jit-optimizations", false); diff --git a/browser/devtools/performance/modules/logic/front.js b/browser/devtools/performance/modules/logic/front.js index 621e1d31dc27..3ab40e7d92a0 100644 --- a/browser/devtools/performance/modules/logic/front.js +++ b/browser/devtools/performance/modules/logic/front.js @@ -528,7 +528,7 @@ function getRecordingModelPrefs () { withMarkers: true, withMemory: Services.prefs.getBoolPref("devtools.performance.ui.enable-memory"), withTicks: Services.prefs.getBoolPref("devtools.performance.ui.enable-framerate"), - withAllocations: Services.prefs.getBoolPref("devtools.performance.ui.enable-memory"), + withAllocations: Services.prefs.getBoolPref("devtools.performance.ui.enable-allocations"), allocationsSampleProbability: +Services.prefs.getCharPref("devtools.performance.memory.sample-probability"), allocationsMaxLogLength: Services.prefs.getIntPref("devtools.performance.memory.max-log-length") }; diff --git a/browser/devtools/performance/performance-controller.js b/browser/devtools/performance/performance-controller.js index 70d8ceed45ac..a45b027e97ed 100644 --- a/browser/devtools/performance/performance-controller.js +++ b/browser/devtools/performance/performance-controller.js @@ -297,7 +297,7 @@ let PerformanceController = { withMarkers: true, withMemory: this.getOption("enable-memory"), withTicks: this.getOption("enable-framerate"), - withAllocations: this.getOption("enable-memory"), + withAllocations: this.getOption("enable-allocations"), allocationsSampleProbability: this.getPref("memory-sample-probability"), allocationsMaxLogLength: this.getPref("memory-max-log-length"), bufferSize: this.getPref("profiler-buffer-size"), diff --git a/browser/devtools/performance/performance.xul b/browser/devtools/performance/performance.xul index 0b5226cbb1ef..5efaa81a2e73 100644 --- a/browser/devtools/performance/performance.xul +++ b/browser/devtools/performance/performance.xul @@ -43,6 +43,12 @@ data-pref="enable-memory" label="&profilerUI.enableMemory;" tooltiptext="&profilerUI.enableMemory.tooltiptext;"/> +