Changeset 120988 in webkit

Timestamp:

Jun 21, 2012, 6:30:19 PM (13 years ago)

Author:

caseq@chromium.org

Message:

Web Inspector: exception in TimelinePresentationModel when recording timeline
​https://bugs.webkit.org/show_bug.cgi?id=89716

Reviewed by Pavel Feldman.

• inspector/front-end/TimelinePanel.js:

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

• inspector/front-end/TimelinePresentationModel.js:

(WebInspector.TimelinePresentationModel.prototype.filteredRecords):
(WebInspector.TimelinePresentationModel.prototype.isVisible):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-21  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: exception in TimelinePresentationModel when recording timeline
+        https://bugs.webkit.org/show_bug.cgi?id=89716
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelinePanel.prototype._innerAddRecordToTimeline.processRecord):
+        (WebInspector.TimelinePanel.prototype._innerAddRecordToTimeline):
+        * inspector/front-end/TimelinePresentationModel.js:
+        (WebInspector.TimelinePresentationModel.prototype.filteredRecords):
+        (WebInspector.TimelinePresentationModel.prototype.isVisible):
+
 2012-06-21  Oli Lan  <olilan@chromium.org>
 

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

@@ -497 +497 @@
         var recordTypes = WebInspector.TimelineModel.RecordType;
         var timeStampRecords = this._timeStampRecords;
-        function addTimestampRecords(record)
+        var hasVisibleRecords = false;
+        var presentationModel = this._presentationModel;
+        function processRecord(record)
         {
             if (WebInspector.TimelinePresentationModel.isEventDivider(record))
                 timeStampRecords.push(record);
+            hasVisibleRecords |= presentationModel.isVisible(record);
         }
         var records = [ formattedRecord ];
-        WebInspector.TimelinePresentationModel.forAllRecords(records, addTimestampRecords);
-        return !!this._presentationModel.filterRecords(records).length || formattedRecord.parent !== this._presentationModel.rootRecord;
+        WebInspector.TimelinePresentationModel.forAllRecords(records, processRecord);
+        // Tell caller update is necessary either if we added a visible record or if we re-parented a record.
+        return hasVisibleRecords || formattedRecord.parent !== this._presentationModel.rootRecord;
     },
 

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

@@ -296 +296 @@
     filteredRecords: function()
     {
-        return this.filterRecords(this._rootRecord.children);
-    },
-
-    filterRecords: function(records)
-    {
-        function filter(record)
-        {
-            for (var i = 0; i < this._filters.length; ++i) {
-                if (!this._filters[i].accept(record))
-                    return false;
-            }
-            return true;
-        }
-        return this._innerFilterRecords(filter.bind(this), records);
-    },
-
-    /**
-     * @param {function(WebInspector.TimelinePresentationModel.Record):boolean} filter
-     * @param {Array.<WebInspector.TimelinePresentationModel.Record>} inputRecords
-     */
-    _innerFilterRecords: function(filter, inputRecords)
-    {
         var recordsInWindow = [];
 
-        var stack = [{children: inputRecords, index: 0, parentIsCollapsed: false}];
+        var stack = [{children: this._rootRecord.children, index: 0, parentIsCollapsed: false}];
         while (stack.length) {
             var entry = stack[stack.length - 1];
@@ -328 +306 @@
                  ++entry.index;
 
-                 if (filter(record)) {
+                 if (this.isVisible(record)) {
                      ++record.parent._invisibleChildrenCount;
                      if (!entry.parentIsCollapsed)
@@ -349 +327 @@
 
         return recordsInWindow;
+    },
+
+    isVisible: function(record)
+    {
+        for (var i = 0; i < this._filters.length; ++i) {
+            if (!this._filters[i].accept(record))
+                return false;
+        }
+        return true;
     }
 }