Backed out changeset 692b2fea4ef6 (bug 1161698) because it was the wrong patch

This commit is contained in:
Wes Kocher 2015-08-13 08:58:09 -07:00
Родитель f65583d27c
Коммит 27904887cf
2 изменённых файлов: 10 добавлений и 14 удалений

Просмотреть файл

@ -61,24 +61,24 @@ let test = Task.async(function*() {
let importedData = PerformanceController.getCurrentRecording().getAllData(); let importedData = PerformanceController.getCurrentRecording().getAllData();
is(importedData.label, "tmpprofile", is(importedData.label, originalData.label,
"The label is identical to the filename without its extension.");
is(importedData.duration, originalData.duration,
"The imported data is identical to the original data (1)."); "The imported data is identical to the original data (1).");
is(importedData.markers.toSource(), originalData.markers.toSource(), is(importedData.duration, originalData.duration,
"The imported data is identical to the original data (2)."); "The imported data is identical to the original data (2).");
is(importedData.memory.toSource(), originalData.memory.toSource(), is(importedData.markers.toSource(), originalData.markers.toSource(),
"The imported data is identical to the original data (3)."); "The imported data is identical to the original data (3).");
is(importedData.ticks.toSource(), originalData.ticks.toSource(), is(importedData.memory.toSource(), originalData.memory.toSource(),
"The imported data is identical to the original data (4)."); "The imported data is identical to the original data (4).");
is(importedData.allocations.toSource(), originalData.allocations.toSource(), is(importedData.ticks.toSource(), originalData.ticks.toSource(),
"The imported data is identical to the original data (5)."); "The imported data is identical to the original data (5).");
is(importedData.profile.toSource(), originalData.profile.toSource(), is(importedData.allocations.toSource(), originalData.allocations.toSource(),
"The imported data is identical to the original data (6)."); "The imported data is identical to the original data (6).");
is(importedData.configuration.withTicks, originalData.configuration.withTicks, is(importedData.profile.toSource(), originalData.profile.toSource(),
"The imported data is identical to the original data (7)."); "The imported data is identical to the original data (7).");
is(importedData.configuration.withMemory, originalData.configuration.withMemory, is(importedData.configuration.withTicks, originalData.configuration.withTicks,
"The imported data is identical to the original data (8)."); "The imported data is identical to the original data (8).");
is(importedData.configuration.withMemory, originalData.configuration.withMemory,
"The imported data is identical to the original data (9).");
yield teardown(panel); yield teardown(panel);
finish(); finish();

Просмотреть файл

@ -104,10 +104,6 @@ function loadRecordingFromFile (file) {
if (recordingData.profile.meta.version === 2) { if (recordingData.profile.meta.version === 2) {
RecordingUtils.deflateProfile(recordingData.profile); RecordingUtils.deflateProfile(recordingData.profile);
} }
if(!recordingData.label) {
// set it to the filename without its extension
recordingData.label = file.leafName.replace(/\..+$/, '');
}
deferred.resolve(recordingData); deferred.resolve(recordingData);
}); });