Changeset 118670 in webkit

Timestamp:

May 28, 2012, 3:20:35 AM (14 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: dom counters graphs vanish on switching between timeline views
​https://bugs.webkit.org/show_bug.cgi?id=87628

Reviewed by Vsevolod Vlasov.

MemoryStatistics object now listens to the TimelineModel events instead of being
populated by timeline panel. This behavior mathes that of the overview pane.

• inspector/front-end/MemoryStatistics.js:

(WebInspector.MemoryStatistics.prototype.addTimlineEvent):

• inspector/front-end/TimelinePanel.js:

(WebInspector.TimelinePanel.prototype._onTimelineEventRecorded):
(WebInspector.TimelinePanel.prototype._innerAddRecordToTimeline):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/MemoryStatistics.js (modified) (3 diffs)
• inspector/front-end/TimelinePanel.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-28  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: dom counters graphs vanish on switching between timeline views
+        https://bugs.webkit.org/show_bug.cgi?id=87628
+
+        Reviewed by Vsevolod Vlasov.
+
+        MemoryStatistics object now listens to the TimelineModel events instead of being
+        populated by timeline panel. This behavior mathes that of the overview pane.
+
+        * inspector/front-end/MemoryStatistics.js:
+        (WebInspector.MemoryStatistics.prototype.addTimlineEvent):
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelinePanel.prototype._onTimelineEventRecorded):
+        (WebInspector.TimelinePanel.prototype._innerAddRecordToTimeline):
+
 2012-05-28  Marcus Bulach  <bulach@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/MemoryStatistics.js

@@ -31 +31 @@
 /**
  * @param {WebInspector.TimelinePanel} timelinePanel
+ * @param {WebInspector.TimelineModel} model
  * @param {number} sidebarWidth
  * @constructor
  */
-WebInspector.MemoryStatistics = function(timelinePanel, sidebarWidth)
+WebInspector.MemoryStatistics = function(timelinePanel, model, sidebarWidth)
 {
     this._timelinePanel = timelinePanel;
     this._counters = [];
+
+    model.addEventListener(WebInspector.TimelineModel.Events.RecordAdded, this._onRecordAdded, this);
+    model.addEventListener(WebInspector.TimelineModel.Events.RecordsCleared, this._onRecordsCleared, this);
 
     this._containerAnchor = timelinePanel.element.lastChild;
@@ -208 +212 @@
 
 WebInspector.MemoryStatistics.prototype = {
-    reset: function()
+    _onRecordsCleared: function()
     {
         this._counters = [];
@@ -252 +256 @@
     },
 
-    addTimlineEvent: function(event)
+    _onRecordAdded: function(event)
     {
         var counters = event.data["counters"];

trunk/Source/WebCore/inspector/front-end/TimelinePanel.js

@@ -62 +62 @@
     this._timelineMemorySplitter.addEventListener("mousedown", this._startSplitterDragging.bind(this), false);
     this._timelineMemorySplitter.addStyleClass("hidden");
-    this._memoryStatistics = new WebInspector.MemoryStatistics(this, this.splitView.preferredSidebarWidth());
+    this._memoryStatistics = new WebInspector.MemoryStatistics(this, this._model, this.splitView.preferredSidebarWidth());
     WebInspector.settings.memoryCounterGraphsHeight = WebInspector.settings.createSetting("memoryCounterGraphsHeight", 150);
 
@@ -483 +483 @@
         this._innerAddRecordToTimeline(event.data, this._rootRecord());
         this._scheduleRefresh(false);
-
-        if (event.data["counters"])
-            this._memoryStatistics.addTimlineEvent(event);
     },
 
@@ -538 +535 @@
         this._closeRecordDetails();
         this._allRecordsCount = 0;
-        this._memoryStatistics.reset();
     },