DevTools: Decouple HeapTimelineOverview from Profiler.HeapSnapshotView

BUG=889545

Change-Id: I880fae90be175883b70915e1d992ea00a4363cc4
Reviewed-on: https://chromium-review.googlesource.com/1252365Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Commit-Queue: Alexei Filippov <alph@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595882}

third_party/blink/renderer/devtools/front_end/profiler/HeapSnapshotView.js

@@ -44,18 +44,14 @@ Profiler.HeapSnapshotView = class extends UI.SimpleView {
     this.element.classList.add('heap-snapshot-view');
     this._profile = profile;
     this._linkifier = new Components.Linkifier();
+    const profileType = profile.profileType();
 
-    profile.profileType().addEventListener(
-        Profiler.HeapSnapshotProfileType.SnapshotReceived, this._onReceiveSnapshot, this);
-    profile.profileType().addEventListener(
-        Profiler.ProfileType.Events.RemoveProfileHeader, this._onProfileHeaderRemoved, this);
+    profileType.addEventListener(Profiler.HeapSnapshotProfileType.SnapshotReceived, this._onReceiveSnapshot, this);
+    profileType.addEventListener(Profiler.ProfileType.Events.RemoveProfileHeader, this._onProfileHeaderRemoved, this);
 
-    const isHeapTimeline = profile.profileType().id === Profiler.TrackingHeapSnapshotProfileType.TypeId;
-    if (isHeapTimeline) {
-      this._trackingOverviewGrid = new Profiler.HeapTimelineOverview(profile);
-      this._trackingOverviewGrid.addEventListener(
-          Profiler.HeapTimelineOverview.IdsRangeChanged, this._onIdsRangeChanged.bind(this));
-    }
+    const isHeapTimeline = profileType.id === Profiler.TrackingHeapSnapshotProfileType.TypeId;
+    if (isHeapTimeline)
+      this._createOverview();
 
     this._parentDataDisplayDelegate = dataDisplayDelegate;
 
@@ -174,6 +170,35 @@ Profiler.HeapSnapshotView = class extends UI.SimpleView {
       existingProfile.addEventListener(Profiler.ProfileHeader.Events.ProfileTitleChanged, this._updateControls, this);
   }
 
+  _createOverview() {
+    const profileType = this._profile.profileType();
+    this._trackingOverviewGrid = new Profiler.HeapTimelineOverview();
+    this._trackingOverviewGrid.addEventListener(
+        Profiler.HeapTimelineOverview.IdsRangeChanged, this._onIdsRangeChanged.bind(this));
+    if (!this._profile.fromFile() && profileType.profileBeingRecorded() === this._profile) {
+      profileType.addEventListener(
+          Profiler.TrackingHeapSnapshotProfileType.HeapStatsUpdate, this._onHeapStatsUpdate, this);
+      profileType.addEventListener(
+          Profiler.TrackingHeapSnapshotProfileType.TrackingStopped, this._onStopTracking, this);
+    }
+  }
+
+  _onStopTracking() {
+    this._profile.profileType().removeEventListener(
+        Profiler.TrackingHeapSnapshotProfileType.HeapStatsUpdate, this._onHeapStatsUpdate, this);
+    this._profile.profileType().removeEventListener(
+        Profiler.TrackingHeapSnapshotProfileType.TrackingStopped, this._onStopTracking, this);
+  }
+
+  /**
+   * @param {!Common.Event} event
+   */
+  _onHeapStatsUpdate(event) {
+    const samples = event.data;
+    if (samples)
+      this._trackingOverviewGrid.setSamples(event.data);
+  }
+
   /**
    * @return {!UI.SearchableView}
    */
@@ -233,7 +258,16 @@ Profiler.HeapSnapshotView = class extends UI.SimpleView {
     if (this._profile.profileType().id === Profiler.TrackingHeapSnapshotProfileType.TypeId &&
         this._profile.fromFile()) {
       const samples = await heapSnapshotProxy.getSamples();
-      this._trackingOverviewGrid.setSamples(samples);
+      if (samples) {
+        console.assert(samples.timestamps.length);
+        const profileSamples = new Profiler.HeapTimelineOverview.Samples();
+        profileSamples.sizes = samples.sizes;
+        profileSamples.ids = samples.lastAssignedIds;
+        profileSamples.timestamps = samples.timestamps;
+        profileSamples.max = samples.sizes;
+        profileSamples.totalTime = Math.max(samples.timestamps.peekLast(), 10000);
+        this._trackingOverviewGrid.setSamples(profileSamples);
+      }
     }
 
     const list = this._profiles();
@@ -709,8 +743,11 @@ Profiler.HeapSnapshotView = class extends UI.SimpleView {
       this._allocationStackView.clear();
       this._allocationDataGrid.dispose();
     }
-    if (this._trackingOverviewGrid)
-      this._trackingOverviewGrid.dispose();
+    this._onStopTracking();
+    if (this._trackingOverviewGrid) {
+      this._trackingOverviewGrid.removeEventListener(
+          Profiler.HeapTimelineOverview.IdsRangeChanged, this._onIdsRangeChanged.bind(this));
+    }
   }
 };
 
@@ -1242,7 +1279,7 @@ Profiler.TrackingHeapSnapshotProfileType = class extends Profiler.HeapSnapshotPr
     if (!heapProfilerModel)
       return null;
     this.setProfileBeingRecorded(new Profiler.HeapProfileHeader(heapProfilerModel, this, undefined));
-    this._profileSamples = new Profiler.TrackingHeapSnapshotProfileType.Samples();
+    this._profileSamples = new Profiler.HeapTimelineOverview.Samples();
     this.profileBeingRecorded()._profileSamples = this._profileSamples;
     this._recording = true;
     this.addProfile(/** @type {!Profiler.ProfileHeader} */ (this.profileBeingRecorded()));
@@ -1324,24 +1361,6 @@ Profiler.TrackingHeapSnapshotProfileType.HeapStatsUpdate = 'HeapStatsUpdate';
 Profiler.TrackingHeapSnapshotProfileType.TrackingStarted = 'TrackingStarted';
 Profiler.TrackingHeapSnapshotProfileType.TrackingStopped = 'TrackingStopped';
 
-/**
- * @unrestricted
- */
-Profiler.TrackingHeapSnapshotProfileType.Samples = class {
-  constructor() {
-    /** @type {!Array.<number>} */
-    this.sizes = [];
-    /** @type {!Array.<number>} */
-    this.ids = [];
-    /** @type {!Array.<number>} */
-    this.timestamps = [];
-    /** @type {!Array.<number>} */
-    this.max = [];
-    /** @type {number} */
-    this.totalTime = 30000;
-  }
-};
-
 /**
  * @unrestricted
  */

third_party/blink/renderer/devtools/front_end/profiler/HeapTimelineOverview.js

@@ -6,10 +6,7 @@
  * @unrestricted
  */
 Profiler.HeapTimelineOverview = class extends UI.VBox {
-  /**
-   * @param {!Profiler.HeapProfileHeader} heapProfileHeader
-   */
-  constructor(heapProfileHeader) {
+  constructor() {
     super();
     this.element.id = 'heap-recording-view';
     this.element.classList.add('heap-tracking-overview');
@@ -23,55 +20,20 @@ Profiler.HeapTimelineOverview = class extends UI.VBox {
     this._overviewCalculator = new Profiler.HeapTimelineOverview.OverviewCalculator();
     this._overviewGrid.addEventListener(PerfUI.OverviewGrid.Events.WindowChanged, this._onWindowChanged, this);
 
-    this._profileSamples = heapProfileHeader.fromFile() ? new Profiler.TrackingHeapSnapshotProfileType.Samples() :
-                                                          heapProfileHeader._profileSamples;
-    this._profileType = heapProfileHeader.profileType();
-    if (!heapProfileHeader.fromFile() && heapProfileHeader.profileType().profileBeingRecorded() === heapProfileHeader) {
-      this._profileType.addEventListener(
-          Profiler.TrackingHeapSnapshotProfileType.HeapStatsUpdate, this._onHeapStatsUpdate, this);
-      this._profileType.addEventListener(
-          Profiler.TrackingHeapSnapshotProfileType.TrackingStopped, this._onStopTracking, this);
-    }
     this._windowLeft = 0.0;
     this._windowRight = 1.0;
     this._overviewGrid.setWindow(this._windowLeft, this._windowRight);
     this._yScale = new Profiler.HeapTimelineOverview.SmoothScale();
     this._xScale = new Profiler.HeapTimelineOverview.SmoothScale();
-  }
 
-  dispose() {
-    this._onStopTracking();
-  }
-
-  _onStopTracking() {
-    this._profileType.removeEventListener(
-        Profiler.TrackingHeapSnapshotProfileType.HeapStatsUpdate, this._onHeapStatsUpdate, this);
-    this._profileType.removeEventListener(
-        Profiler.TrackingHeapSnapshotProfileType.TrackingStopped, this._onStopTracking, this);
-  }
-
-  /**
-   * @param {!Common.Event} event
-   */
-  _onHeapStatsUpdate(event) {
-    this._profileSamples = event.data;
-    this._scheduleUpdate();
+    this._profileSamples = new Profiler.HeapTimelineOverview.Samples();
   }
 
   /**
-   * @param {?HeapSnapshotModel.Samples} samples
+   * @param {!Profiler.HeapTimelineOverview.Samples} samples
    */
   setSamples(samples) {
-    if (!samples)
-      return;
-    console.assert(!this._profileSamples.timestamps.length, 'Should only call this method when loading from file.');
-    console.assert(samples.timestamps.length);
-    this._profileSamples = new Profiler.TrackingHeapSnapshotProfileType.Samples();
-    this._profileSamples.sizes = samples.sizes;
-    this._profileSamples.ids = samples.lastAssignedIds;
-    this._profileSamples.timestamps = samples.timestamps;
-    this._profileSamples.max = samples.sizes;
-    this._profileSamples.totalTime = /** @type{number} */ (samples.timestamps.peekLast());
+    this._profileSamples = samples;
     this.update();
   }
 
@@ -298,6 +260,24 @@ Profiler.HeapTimelineOverview.SmoothScale = class {
   }
 };
 
+/**
+ * @unrestricted
+ */
+Profiler.HeapTimelineOverview.Samples = class {
+  constructor() {
+    /** @type {!Array<number>} */
+    this.sizes = [];
+    /** @type {!Array<number>} */
+    this.ids = [];
+    /** @type {!Array<number>} */
+    this.timestamps = [];
+    /** @type {!Array<number>} */
+    this.max = [];
+    /** @type {number} */
+    this.totalTime = 30000;
+  }
+};
+
 /**
  * @implements {PerfUI.TimelineGrid.Calculator}
  * @unrestricted