Bug 1172182 part 2: correctly link to the memory module via timeline actor. r=vp
authorJordan Santell <jsantell@mozilla.com>
Tue, 09 Jun 2015 22:31:19 -0700
changeset 247976 ea7e872d6e4c5803ea9070990201732f232361ce
parent 247975 65d973f2bbdf16df3614321217c7a71c7aa74c95
child 247977 fd60bc4207c6939c3677b3b50e3eb4f96a591ebc
push id28887
push userkwierso@gmail.com
push dateThu, 11 Jun 2015 01:10:53 +0000
treeherdermozilla-central@1fd19d8fc936 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvp
bugs1172182
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 1172182 part 2: correctly link to the memory module via timeline actor. r=vp
toolkit/devtools/server/actors/timeline.js
--- a/toolkit/devtools/server/actors/timeline.js
+++ b/toolkit/devtools/server/actors/timeline.js
@@ -21,17 +21,17 @@
 
 const {Ci, Cu} = require("chrome");
 const protocol = require("devtools/server/protocol");
 const {method, Arg, RetVal, Option} = protocol;
 const events = require("sdk/event/core");
 const {setTimeout, clearTimeout} = require("sdk/timers");
 const {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
 
-const {MemoryBridge} = require("devtools/server/actors/utils/memory-bridge");
+const {Memory} = require("devtools/toolkit/shared/memory");
 const {FramerateActor} = require("devtools/server/actors/framerate");
 const {StackFrameCache} = require("devtools/server/actors/utils/stack");
 
 // How often do we pull markers from the docShells, and therefore, how often do
 // we send events to the front (knowing that when there are no markers in the
 // docShell, no event is sent).
 const DEFAULT_TIMELINE_DATA_PULL_TIMEOUT = 200; // ms
 
@@ -260,17 +260,17 @@ let TimelineActor = exports.TimelineActo
     this._stackFrames.initFrames();
     this._withMemory = withMemory;
     this._withTicks = withTicks;
 
     for (let docShell of this.docShells) {
       docShell.recordProfileTimelineMarkers = true;
     }
 
-    this._memoryBridge = new MemoryBridge(this.tabActor, this._stackFrames);
+    this._memoryBridge = new Memory(this.tabActor, this._stackFrames);
     this._memoryBridge.attach();
     events.on(this._memoryBridge, "garbage-collection", this._onGarbageCollection);
 
     if (withTicks) {
       this._framerateActor = new FramerateActor(this.conn, this.tabActor);
       this._framerateActor.startRecording();
     }