author | Victor Porof <vporof@mozilla.com> |
Fri, 16 Jan 2015 13:44:24 -0500 | |
changeset 224336 | 4bb30ec57818382e86ef1a2e1f9488e597318138 |
parent 224335 | 62b1908ad41329fe82f2faf9502112bba73095c5 |
child 224337 | e41cbd7c6973080b316cf4b536c5b4958848b5d4 |
push id | 54190 |
push user | kwierso@gmail.com |
push date | Sat, 17 Jan 2015 02:06:29 +0000 |
treeherder | mozilla-inbound@369a8f14ccf8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jsantell |
bugs | 1122180 |
milestone | 38.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
|
--- a/browser/devtools/performance/modules/io.js +++ b/browser/devtools/performance/modules/io.js @@ -114,17 +114,16 @@ exports.PerformanceIO = PerformanceIO; */ function isValidSerializerVersion (version) { return !!~[ PERF_TOOL_SERIALIZER_LEGACY_VERSION, PERF_TOOL_SERIALIZER_CURRENT_VERSION ].indexOf(version); } - /** * Takes recording data (with version `1`, from the original profiler tool), and * massages the data to be line with the current performance tool's property names * and values. * * @param object legacyData * @return object */
--- a/browser/devtools/performance/performance-controller.js +++ b/browser/devtools/performance/performance-controller.js @@ -245,17 +245,17 @@ let PerformanceController = { * * @param nsILocalFile file * The file to import the data from. */ importRecording: Task.async(function*(_, file) { let recording = this.createNewRecording(); yield recording.importRecording(file); - this.emit(EVENTS.RECORDING_IMPORTED, recording.getAllData(), recording); + this.emit(EVENTS.RECORDING_IMPORTED, recording); }), /** * Creates a new RecordingModel, fires events and stores it * internally in the controller. * * @return RecordingModel * The newly created recording model.
--- a/browser/devtools/performance/views/recordings.js +++ b/browser/devtools/performance/views/recordings.js @@ -146,22 +146,20 @@ let RecordingsView = Heritage.extend(Wid // Render the recording item with finalized information (timing, etc) this.finalizeRecording(recordingItem); this.forceSelect(recordingItem); }, /** * Signals that a recording has been imported. * - * @param object recordingData - * The profiler and refresh driver ticks data received from the front. * @param RecordingModel model * The recording model containing data on the recording session. */ - _onRecordingImported: function (_, recordingData, model) { + _onRecordingImported: function (_, model) { let recordingItem = this.addEmptyRecording(model); recordingItem.isRecording = false; // Immediately select the imported recording this.selectedItem = recordingItem; // Render the recording item with finalized information (timing, etc) this.finalizeRecording(recordingItem);