Backed out changeset f937e8d943d8 (bug 1147945) for xpcshell failures.

This commit is contained in:
Ryan VanderMeulen
2015-04-07 13:44:58 -04:00
parent 652b95640f
commit a855cc2859
8 changed files with 23 additions and 93 deletions

View File

@@ -199,9 +199,7 @@ let PerformanceController = {
this._nonBooleanPrefs = new ViewHelpers.Prefs("devtools.performance", {
"hidden-markers": ["Json", "timeline.hidden-markers"],
"memory-sample-probability": ["Float", "memory.sample-probability"],
"memory-max-log-length": ["Int", "memory.max-log-length"],
"profiler-buffer-size": ["Int", "profiler.buffer-size"],
"profiler-sample-frequency": ["Int", "profiler.sample-frequency-khz"]
"memory-max-log-length": ["Int", "memory.max-log-length"]
});
this._nonBooleanPrefs.registerObserver();
@@ -292,9 +290,7 @@ let PerformanceController = {
withTicks: this.getOption("enable-framerate"),
withAllocations: this.getOption("enable-memory"),
allocationsSampleProbability: this.getPref("memory-sample-probability"),
allocationsMaxLogLength: this.getPref("memory-max-log-length"),
bufferSize: this.getPref("profiler-buffer-size"),
sampleInterval: 1 / (this.getPref("profiler-sample-frequency") || 1)
allocationsMaxLogLength: this.getPref("memory-max-log-length")
});
this.emit(EVENTS.RECORDING_WILL_START, recording);