Modified: trunk/Source/WebInspectorUI/ChangeLog (187569 => 187570)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-07-30 00:47:34 UTC (rev 187569)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-30 01:18:04 UTC (rev 187570)
@@ -1,3 +1,22 @@
+2015-07-29 Matt Baker <mattba...@apple.com>
+
+ Web Inspector: Allow record filtering by frame duration in Rendering Frames timeline
+ https://bugs.webkit.org/show_bug.cgi?id=147419
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ New scope bar item labels.
+
+ * UserInterface/Views/RenderingFrameTimelineView.js:
+ (WebInspector.RenderingFrameTimelineView):
+ New scope bar for frame duration filtering.
+ (WebInspector.RenderingFrameTimelineView.displayNameForDurationFilter):
+ (WebInspector.RenderingFrameTimelineView.prototype.matchTreeElementAgainstCustomFilters):
+ Overridden for view specific filtering. Filtering applies to RenderingFrameTimelineRecords only.
+ (WebInspector.RenderingFrameTimelineView.prototype._scopeBarSelectionDidChange):
+ Force sidebar filtering when duration filter changes.
+
2015-07-28 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: console.groupEnd causes negative indent when no group is active
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (187569 => 187570)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-07-30 00:47:34 UTC (rev 187569)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-07-30 01:18:04 UTC (rev 187570)
@@ -362,6 +362,8 @@
localizedStrings["Other"] = "Other";
localizedStrings["Other Issue"] = "Other Issue";
localizedStrings["Output: "] = "Output: ";
+localizedStrings["Over 1 ms"] = "Over 1 ms";
+localizedStrings["Over 15 ms"] = "Over 15 ms";
localizedStrings["Owns"] = "Owns";
localizedStrings["Page Issue"] = "Page Issue";
localizedStrings["Paint"] = "Paint";
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js (187569 => 187570)
--- trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js 2015-07-30 00:47:34 UTC (rev 187569)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js 2015-07-30 01:18:04 UTC (rev 187570)
@@ -31,6 +31,15 @@
this.navigationSidebarTreeOutline.element.classList.add("rendering-frame");
+ var scopeBarItems = [];
+ for (var key in WebInspector.RenderingFrameTimelineView.DurationFilter) {
+ var value = WebInspector.RenderingFrameTimelineView.DurationFilter[key];
+ scopeBarItems.push(new WebInspector.ScopeBarItem(value, WebInspector.RenderingFrameTimelineView.displayNameForDurationFilter(value)));
+ }
+
+ this._scopeBar = new WebInspector.ScopeBar("rendering-frame-scope-bar", scopeBarItems, scopeBarItems[0], true);
+ this._scopeBar.addEventListener(WebInspector.ScopeBar.Event.SelectionChanged, this._scopeBarSelectionDidChange, this);
+
var columns = {location: {}, startTime: {}, scriptTime: {}, paintTime: {}, layoutTime: {}, otherTime: {}, totalTime: {}};
columns.location.title = WebInspector.UIString("Location");
@@ -75,6 +84,28 @@
this._pendingRecords = [];
};
+WebInspector.RenderingFrameTimelineView.DurationFilter = {
+ All: "rendering-frame-timeline-view-duration-filter-all",
+ OverOneMillisecond: "rendering-frame-timeline-view-duration-filter-over-1-ms",
+ OverFifteenMilliseconds: "rendering-frame-timeline-view-duration-filter-over-15-ms"
+};
+
+WebInspector.RenderingFrameTimelineView.displayNameForDurationFilter = function(filter)
+{
+ switch (filter) {
+ case WebInspector.RenderingFrameTimelineView.DurationFilter.All:
+ return WebInspector.UIString("All");
+ case WebInspector.RenderingFrameTimelineView.DurationFilter.OverOneMillisecond:
+ return WebInspector.UIString("Over 1 ms");
+ case WebInspector.RenderingFrameTimelineView.DurationFilter.OverFifteenMilliseconds:
+ return WebInspector.UIString("Over 15 ms");
+ default:
+ console.error("Unknown tab type", tabType);
+ }
+
+ return null;
+};
+
WebInspector.RenderingFrameTimelineView.prototype = {
constructor: WebInspector.RenderingFrameTimelineView,
__proto__: WebInspector.TimelineView.prototype,
@@ -145,7 +176,20 @@
matchTreeElementAgainstCustomFilters: function(treeElement)
{
- return this._dataGrid.treeElementMatchesActiveScopeFilters(treeElement);
+ console.assert(this._scopeBar.selectedItems.length === 1);
+ var selectedScopeBarItem = this._scopeBar.selectedItems[0];
+ if (!selectedScopeBarItem || selectedScopeBarItem.id === WebInspector.RenderingFrameTimelineView.DurationFilter.All)
+ return true;
+
+ while (treeElement && !(treeElement.record instanceof WebInspector.RenderingFrameTimelineRecord))
+ treeElement = treeElement.parent;
+
+ console.assert(treeElement, "Cannot apply duration filter: no RenderingFrameTimelineRecord found.");
+ if (!treeElement)
+ return false;
+
+ var minimumDuration = selectedScopeBarItem.id === WebInspector.RenderingFrameTimelineView.DurationFilter.OverOneMillisecond ? 0.001 : 0.015;
+ return treeElement.record.duration > minimumDuration;
},
reset: function()
@@ -269,5 +313,10 @@
_dataGridNodeSelected: function(event)
{
this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
+ },
+
+ _scopeBarSelectionDidChange: function(event)
+ {
+ this.timelineSidebarPanel.updateFilter();
}
};
