Changeset 119485 in webkit

Timestamp:

Jun 5, 2012, 7:50:04 AM (14 years ago)

Author:

caseq@chromium.org

Message:

Web Inspector: aggregate all events before first frame into a fake frame
​https://bugs.webkit.org/show_bug.cgi?id=88229

• in Timeline's frame mode, start aggregating events by frame even before we get first frame marker.

• inspector/front-end/TimelineFrameController.js:

(WebInspector.TimelineFrameController.prototype._addRecord):
(WebInspector.TimelineFrameController.prototype._flushFrame):
(WebInspector.TimelineFrameController.prototype._createFrame):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/TimelineFrameController.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-05  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: aggregate all events before first frame into a fake frame
+        https://bugs.webkit.org/show_bug.cgi?id=88229
+
+        - in Timeline's frame mode, start aggregating events by frame even before we get first frame marker.
+
+        * inspector/front-end/TimelineFrameController.js:
+        (WebInspector.TimelineFrameController.prototype._addRecord):
+        (WebInspector.TimelineFrameController.prototype._flushFrame):
+        (WebInspector.TimelineFrameController.prototype._createFrame):
+
 2012-06-05  Charles Wei  <charles.wei@torchmobile.com.cn>
 

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

@@ -62 +62 @@
     _addRecord: function(record)
     {
-        if (record.type === WebInspector.TimelineModel.RecordType.BeginFrame)
+        if (record.type === WebInspector.TimelineModel.RecordType.BeginFrame && this._lastFrame)
             this._flushFrame(record);
-        else if (this._lastFrame) {
+        else {
+            if (!this._lastFrame)
+                this._lastFrame = this._createFrame(record);
             WebInspector.TimelineModel.aggregateTimeForRecord(this._lastFrame.timeByCategory, record);
             this._lastFrame.cpuTime += WebInspector.TimelineModel.durationInSeconds(record);
-        } else {
-            // No frame records so far -- generate a synthetic frame per each top-level record, but only
-            // dispatch these to the overview.
-            this._overviewPane.addFrame(this._createSyntheticFrame(record));
         }
     },
@@ -76 +74 @@
     _flushFrame: function(record)
     {
-        var frameBeginTime = WebInspector.TimelineModel.startTimeInSeconds(record);
-        if (this._lastFrame) {
-            this._lastFrame.endTime = frameBeginTime;
-            this._lastFrame.duration = this._lastFrame.endTime - this._lastFrame.startTime;
-            this._overviewPane.addFrame(this._lastFrame);
-            this._presentationModel.addFrame(this._lastFrame);
-        }
-        this._lastFrame = new WebInspector.TimelineFrame();
-        this._lastFrame.startTime = frameBeginTime;
-        this._lastFrame.startTimeOffset = this._model.recordOffsetInSeconds(record);
+        this._lastFrame.endTime = WebInspector.TimelineModel.startTimeInSeconds(record);
+        this._lastFrame.duration = this._lastFrame.endTime - this._lastFrame.startTime;
+        this._overviewPane.addFrame(this._lastFrame);
+        this._presentationModel.addFrame(this._lastFrame);
+        this._lastFrame = this._createFrame(record);
     },
 
-    _createSyntheticFrame: function(record)
+    _createFrame: function(record)
     {
         var frame = new WebInspector.TimelineFrame();
         frame.startTime = WebInspector.TimelineModel.startTimeInSeconds(record);
         frame.startTimeOffset = this._model.recordOffsetInSeconds(record);
-        frame.endTime = WebInspector.TimelineModel.endTimeInSeconds(record);
-        frame.duration = WebInspector.TimelineModel.durationInSeconds(record);
-        frame.cpuTime = frame.duration;
         return frame;
     },