Backed out changeset 67611ffb1fef (bug 1325213) for failures in test_require_lazy.js

This commit is contained in:
Phil Ringnalda
2016-12-29 19:01:37 -08:00
parent 4707185ade
commit 83857fe4ea
40 changed files with 798 additions and 967 deletions

View File

@@ -3,6 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const { Cc, Ci, Cu, Cr } = require("chrome");
loader.lazyRequireGetter(this, "extend",
"sdk/util/object", true);
@@ -15,8 +16,7 @@ function mapRecordingOptions(type, options) {
if (type === "profiler") {
return {
entries: options.bufferSize,
interval: options.sampleFrequency ? (1000 / (options.sampleFrequency * 1000))
: void 0
interval: options.sampleFrequency ? (1000 / (options.sampleFrequency * 1000)) : void 0
};
}
@@ -568,8 +568,7 @@ UniqueStacks.prototype.getOrAddFrameIndex = function (frame) {
let implementationIndex = this.getOrAddStringIndex(frame.implementation);
// Super dumb.
let hash = `${locationIndex} ${implementationIndex || ""} ` +
`${frame.line || ""} ${frame.category || ""}`;
let hash = `${locationIndex} ${implementationIndex || ""} ${frame.line || ""} ${frame.category || ""}`;
let index = frameHash[hash];
if (index !== undefined) {