Bug 1150295 pt2: fix rebase error on renaming optimization hint. a=kwierso
authorJordan Santell <jsantell@mozilla.com>
Fri, 19 Jun 2015 17:47:13 -0700
changeset 280603 a452ab15ac37fa989603b742f6f08716e7293544
parent 280602 84df534bc80ecf16d31530373ea0f278ce263d8d
child 280604 b6225e1a5b2fbef286c258421c4242f24997ab93
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskwierso
bugs1150295
milestone41.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
Bug 1150295 pt2: fix rebase error on renaming optimization hint. a=kwierso
browser/devtools/performance/views/details-js-call-tree.js
--- a/browser/devtools/performance/views/details-js-call-tree.js
+++ b/browser/devtools/performance/views/details-js-call-tree.js
@@ -101,17 +101,17 @@ let JsCallTreeView = Heritage.extend(Det
     let root = new CallView({
       frame: frameNode,
       inverted: inverted,
       // The synthesized root node is hidden in inverted call trees.
       hidden: inverted,
       // Call trees should only auto-expand when not inverted. Passing undefined
       // will default to the CALL_TREE_AUTO_EXPAND depth.
       autoExpandDepth: inverted ? 0 : undefined,
-      enableOptimizations: options.enableOptimizations
+      showOptimizationHint: options.showOptimizationHint
     });
 
     // Bind events.
     root.on("link", this._onLink);
 
     // Pipe "focus" events to the view, mostly for tests
     root.on("focus", () => this.emit("focus"));
     // TODO tests for optimization event and rendering