<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193034] branches/safari-601-branch/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193034">193034</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:33:52 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187570">r187570</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193033 => 193034)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:33:47 UTC (rev 193033)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:33:52 UTC (rev 193034)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-12-01 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187570. rdar://problem/23221163
+
+ 2015-07-29 Matt Baker <mattbaker@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-12-01 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r187528. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-07-28 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (193033 => 193034)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-03 18:33:47 UTC (rev 193033)
+++ branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-03 18:33:52 UTC (rev 193034)
</span><span class="lines">@@ -362,6 +362,8 @@
</span><span class="cx"> localizedStrings["Other"] = "Other";
</span><span class="cx"> localizedStrings["Other Issue"] = "Other Issue";
</span><span class="cx"> localizedStrings["Output: "] = "Output: ";
</span><ins>+localizedStrings["Over 1 ms"] = "Over 1 ms";
+localizedStrings["Over 15 ms"] = "Over 15 ms";
</ins><span class="cx"> localizedStrings["Owns"] = "Owns";
</span><span class="cx"> localizedStrings["Page Issue"] = "Page Issue";
</span><span class="cx"> localizedStrings["Paint"] = "Paint";
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js (193033 => 193034)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js 2015-12-03 18:33:47 UTC (rev 193033)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js 2015-12-03 18:33:52 UTC (rev 193034)
</span><span class="lines">@@ -31,6 +31,15 @@
</span><span class="cx">
</span><span class="cx"> this.navigationSidebarTreeOutline.element.classList.add("rendering-frame");
</span><span class="cx">
</span><ins>+ 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);
+
</ins><span class="cx"> var columns = {location: {}, startTime: {}, scriptTime: {}, paintTime: {}, layoutTime: {}, otherTime: {}, totalTime: {}};
</span><span class="cx">
</span><span class="cx"> columns.location.title = WebInspector.UIString("Location");
</span><span class="lines">@@ -75,6 +84,28 @@
</span><span class="cx"> this._pendingRecords = [];
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+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;
+};
+
</ins><span class="cx"> WebInspector.RenderingFrameTimelineView.prototype = {
</span><span class="cx"> constructor: WebInspector.RenderingFrameTimelineView,
</span><span class="cx"> __proto__: WebInspector.TimelineView.prototype,
</span><span class="lines">@@ -145,7 +176,20 @@
</span><span class="cx">
</span><span class="cx"> matchTreeElementAgainstCustomFilters: function(treeElement)
</span><span class="cx"> {
</span><del>- return this._dataGrid.treeElementMatchesActiveScopeFilters(treeElement);
</del><ins>+ 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;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> reset: function()
</span><span class="lines">@@ -269,5 +313,10 @@
</span><span class="cx"> _dataGridNodeSelected: function(event)
</span><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
</span><ins>+ },
+
+ _scopeBarSelectionDidChange: function(event)
+ {
+ this.timelineSidebarPanel.updateFilter();
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>