Changeset 56772 in webkit

Timestamp:

Mar 30, 2010 1:59:20 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-03-30 Ilya Tikhonovsky <​loislo@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: Visible/captured records counter should be implemented in Timeline panel.
​https://bugs.webkit.org/show_bug.cgi?id=36708

• English.lproj/localizedStrings.js:
• inspector/front-end/TimelinePanel.js: (WebInspector.TimelinePanel.prototype.get statusBarItems): (WebInspector.TimelinePanel.prototype._createStatusbarButtons): (WebInspector.TimelinePanel.prototype._updateRecordsCounter): (WebInspector.TimelinePanel.prototype._innerAddRecordToTimeline): (WebInspector.TimelinePanel.prototype._createRootRecord): (WebInspector.TimelinePanel.prototype._refresh): (WebInspector.TimelinePanel.prototype._filterRecords):
• inspector/front-end/inspector.css: (.timeline-records-counter):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (previous)
• inspector/front-end/TimelinePanel.js (modified) (11 diffs)
• inspector/front-end/inspector.css (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-30  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Visible/captured records counter should be implemented in Timeline panel.
+        https://bugs.webkit.org/show_bug.cgi?id=36708
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelinePanel.prototype.get statusBarItems):
+        (WebInspector.TimelinePanel.prototype._createStatusbarButtons):
+        (WebInspector.TimelinePanel.prototype._updateRecordsCounter):
+        (WebInspector.TimelinePanel.prototype._innerAddRecordToTimeline):
+        (WebInspector.TimelinePanel.prototype._createRootRecord):
+        (WebInspector.TimelinePanel.prototype._refresh):
+        (WebInspector.TimelinePanel.prototype._filterRecords):
+        * inspector/front-end/inspector.css:
+        (.timeline-records-counter):
+
 2010-03-30  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -105 +105 @@
     get statusBarItems()
     {
-        return [this.toggleFilterButton.element, this.toggleTimelineButton.element, this.clearButton.element];
+        return [this.toggleFilterButton.element, this.toggleTimelineButton.element, this.clearButton.element, this.recordsCounter];
     },
 
@@ -162 +162 @@
         this.toggleFilterButton = new WebInspector.StatusBarButton(WebInspector.UIString("Show short records"), "timeline-filter-status-bar-item");
         this.toggleFilterButton.addEventListener("click", this._toggleFilterButtonClicked.bind(this), false);
+
+        this.recordsCounter = document.createElement("span");
+        this.recordsCounter.className = "timeline-records-counter";
+    },
+
+    _updateRecordsCounter: function()
+    {
+        this.recordsCounter.textContent = WebInspector.UIString("%d of %d captured records are visible", this._rootRecord._visibleRecordsCount, this._rootRecord._allRecordsCount);
     },
 
@@ -231 +239 @@
 
         var formattedRecord = new WebInspector.TimelinePanel.FormattedRecord(record, parentRecord, this._recordStyles, this._sendRequestRecords, this._timerRecords);
+        ++this._rootRecord._allRecordsCount;
+
         if (parentRecord === this._rootRecord)
             formattedRecord.collapsed = true;
@@ -243 +253 @@
             while (record.parent && record.parent._lastChildEndTime < record._lastChildEndTime) {
                 record.parent._lastChildEndTime = record._lastChildEndTime;
+                if (!record.parent._hasLongChildrenEvents)
+                    record.parent._hasLongChildrenEvents = record._isLongEvent();
                 record = record.parent;
-            }
-            // We have attached a fresh event record received from Timeline Agent to some old event record.
-            // If that old parent record haven't had long children events and new child record has it
-            // then we want to propagate _hasLongChildrenEvents flag to parent, grand-parent etc.
-            if (record._isLongEvent()) {
-                record = formattedRecord;
-                while (record.parent && !record.parent._isLongEvent()) {
-                    record = record.parent;
-                    record._hasLongChildrenEvents = true;
-                }
             }
         }
@@ -283 +285 @@
         var rootRecord = {};
         rootRecord.children = [];
+        rootRecord._visibleRecordsCount = 0;
+        rootRecord._allRecordsCount = 0;
         return rootRecord;
     },
@@ -330 +334 @@
     _scheduleRefresh: function(preserveBoundaries)
     {
-        if (preserveBoundaries)
-            this._closeRecordDetails();
+        this._closeRecordDetails();
         this._boundariesAreValid &= preserveBoundaries;
         if (this._needsRefresh)
@@ -356 +359 @@
             this._overviewPane.update(this._rootRecord.children);
         this._refreshRecords(!this._boundariesAreValid);
+        this._updateRecordsCounter();
         this._boundariesAreValid = true;
     },
@@ -361 +365 @@
     _updateBoundaries: function()
     {
-            this._calculator.reset();
-            this._calculator.windowLeft = this._overviewPane.windowLeft;
-            this._calculator.windowRight = this._overviewPane.windowRight;
-
-            for (var i = 0; i < this._rootRecord.children.length; ++i)
-                this._calculator.updateBoundaries(this._rootRecord.children[i]);
-
-            this._calculator.calculateWindow();
-    },
-
-    _addToRecordsWindow: function(record, recordsWindow)
+        this._calculator.reset();
+        this._calculator.windowLeft = this._overviewPane.windowLeft;
+        this._calculator.windowRight = this._overviewPane.windowRight;
+
+        for (var i = 0; i < this._rootRecord.children.length; ++i)
+            this._calculator.updateBoundaries(this._rootRecord.children[i]);
+
+        this._calculator.calculateWindow();
+    },
+
+    _addToRecordsWindow: function(record, recordsWindow, parentIsCollapsed)
     {
         if (!this._calculator._showShortEvents && !record._isLongEvent())
             return;
-
-        recordsWindow.push(record);
+        var percentages = this._calculator.computeBarGraphPercentages(record);
+        if (percentages.start < 100 && percentages.endWithChildren >= 0 && !record.category.hidden) {
+            ++this._rootRecord._visibleRecordsCount;
+            ++record.parent._invisibleChildrenCount;
+            if (!parentIsCollapsed)
+                recordsWindow.push(record);
+        }
+
         var index = recordsWindow.length;
-        if (!record.collapsed) {
-            for (var i = 0; i < record.children.length; ++i)
-                this._addToRecordsWindow(record.children[i], recordsWindow);
-        }
-        record.visibleChildrenCount = recordsWindow.length - index;
+        record._invisibleChildrenCount = 0;
+        for (var i = 0; i < record.children.length; ++i)
+            this._addToRecordsWindow(record.children[i], recordsWindow, parentIsCollapsed || record.collapsed);
+        record._visibleChildrenCount = recordsWindow.length - index;
     },
 
@@ -388 +397 @@
     {
         var recordsInWindow = [];
-        for (var i = 0; i < this._rootRecord.children.length; ++i) {
-            var record = this._rootRecord.children[i];
-            var percentages = this._calculator.computeBarGraphPercentages(record);
-            if (percentages.start < 100 && percentages.endWithChildren >= 0 && !record.category.hidden)
-                this._addToRecordsWindow(record, recordsInWindow);
-        }
+        this._rootRecord._visibleRecordsCount = 0;
+        for (var i = 0; i < this._rootRecord.children.length; ++i)
+            this._addToRecordsWindow(this._rootRecord.children[i], recordsInWindow);
         return recordsInWindow;
     },
@@ -557 +563 @@
             this._absoluteMinimumBoundary = lowerBound;
 
-        var upperBound = record._lastChildEndTime;
+        const minimumTimeFrame = 0.1;
+        const minimumDeltaForZeroSizeEvents = 0.01;
+        var upperBound = Math.max(record._lastChildEndTime + minimumDeltaForZeroSizeEvents, lowerBound + minimumTimeFrame);
         if (this._absoluteMaximumBoundary === -1 || upperBound > this._absoluteMaximumBoundary)
             this._absoluteMaximumBoundary = upperBound;
@@ -668 +676 @@
         this._barElement.style.width =  barPosition.width + "px";
 
-        if (record.visibleChildrenCount || record._hasLongChildrenEvents || (calculator._showShortEvents && record.children.length)) {
+        if (record._visibleChildrenCount || record._invisibleChildrenCount) {
             this._expandElement.style.top = index * this._rowHeight + "px";
             this._expandElement.style.left = barPosition.left + "px";
             this._expandElement.style.width = Math.max(12, barPosition.width + 25) + "px";
             if (!record.collapsed) {
-                this._expandElement.style.height = (record.visibleChildrenCount + 1) * this._rowHeight + "px";
+                this._expandElement.style.height = (record._visibleChildrenCount + 1) * this._rowHeight + "px";
                 this._expandElement.addStyleClass("timeline-expandable-expanded");
                 this._expandElement.removeStyleClass("timeline-expandable-collapsed");

trunk/WebCore/inspector/front-end/inspector.css

@@ -3658 +3658 @@
 }
 
+.timeline-records-counter {
+    font-size: 11px;
+    position: relative;
+    top: 5px;
+    margin-left: 5px;
+    text-shadow: white 0 1px 0;
+}
+
 /* Profiler Style */