<!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>[162414] trunk/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/162414">162414</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 18:55:44 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Filter the Timeline overview graph and sidebar based on the current time selection.
https://bugs.webkit.org/show_bug.cgi?id=126955
Reviewed by Joseph Pecoraro.
* UserInterface/NavigationSidebarPanel.js:
(WebInspector.NavigationSidebarPanel.prototype.updateFilter):
(WebInspector.NavigationSidebarPanel.prototype.hasCustomFilters):
(WebInspector.NavigationSidebarPanel.prototype.matchTreeElementAgainstCustomFilters):
(WebInspector.NavigationSidebarPanel.prototype.applyFiltersToTreeElement.matchTextFilter):
(WebInspector.NavigationSidebarPanel.prototype.applyFiltersToTreeElement):
Add support for custom filters implemented by subclasses.
* UserInterface/TimelineContentView.js:
(WebInspector.TimelineContentView.prototype.matchTreeElementAgainstCustomFilters.checkTimeBounds):
(WebInspector.TimelineContentView.prototype.matchTreeElementAgainstCustomFilters):
(WebInspector.TimelineContentView.prototype._timeRangeSelectionChanged):
Filter known tree element types by time.
* UserInterface/TimelineSidebarPanel.css:
(.sidebar > .panel.timeline > .empty-content-placeholder):
Position the empty placeholder with the content.
* UserInterface/TimelineSidebarPanel.js:
(WebInspector.TimelineSidebarPanel.prototype.hasCustomFilters):
(WebInspector.TimelineSidebarPanel.prototype.matchTreeElementAgainstCustomFilters):
Defer filtering to the TimelineContentView.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceNavigationSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/NavigationSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceTimelineContentViewjs">trunk/Source/WebInspectorUI/UserInterface/TimelineContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceTimelineSidebarPanelcss">trunk/Source/WebInspectorUI/UserInterface/TimelineSidebarPanel.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceTimelineSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/TimelineSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (162413 => 162414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-01-21 02:55:38 UTC (rev 162413)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-01-21 02:55:44 UTC (rev 162414)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2014-01-13 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Filter the Timeline overview graph and sidebar based on the current time selection.
+
+ https://bugs.webkit.org/show_bug.cgi?id=126955
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel.prototype.updateFilter):
+ (WebInspector.NavigationSidebarPanel.prototype.hasCustomFilters):
+ (WebInspector.NavigationSidebarPanel.prototype.matchTreeElementAgainstCustomFilters):
+ (WebInspector.NavigationSidebarPanel.prototype.applyFiltersToTreeElement.matchTextFilter):
+ (WebInspector.NavigationSidebarPanel.prototype.applyFiltersToTreeElement):
+ Add support for custom filters implemented by subclasses.
+
+ * UserInterface/TimelineContentView.js:
+ (WebInspector.TimelineContentView.prototype.matchTreeElementAgainstCustomFilters.checkTimeBounds):
+ (WebInspector.TimelineContentView.prototype.matchTreeElementAgainstCustomFilters):
+ (WebInspector.TimelineContentView.prototype._timeRangeSelectionChanged):
+ Filter known tree element types by time.
+
+ * UserInterface/TimelineSidebarPanel.css:
+ (.sidebar > .panel.timeline > .empty-content-placeholder):
+ Position the empty placeholder with the content.
+
+ * UserInterface/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.prototype.hasCustomFilters):
+ (WebInspector.TimelineSidebarPanel.prototype.matchTreeElementAgainstCustomFilters):
+ Defer filtering to the TimelineContentView.
+
+2014-01-13 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Implement state cookie support for WebInspector.TimelineSidebarPanel.
</span><span class="cx">
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126921
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceNavigationSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/NavigationSidebarPanel.js (162413 => 162414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/NavigationSidebarPanel.js 2014-01-21 02:55:38 UTC (rev 162413)
+++ trunk/Source/WebInspectorUI/UserInterface/NavigationSidebarPanel.js 2014-01-21 02:55:44 UTC (rev 162414)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> this._contentTreeOutline = this.createContentTreeOutline(true);
</span><span class="cx">
</span><span class="cx"> this._filterBar = new WebInspector.FilterBar();
</span><del>- this._filterBar.addEventListener(WebInspector.FilterBar.Event.TextFilterDidChange, this._updateFilter, this);
</del><ins>+ this._filterBar.addEventListener(WebInspector.FilterBar.Event.TextFilterDidChange, this._textFilterDidChange, this);
</ins><span class="cx"> this.element.appendChild(this._filterBar.element);
</span><span class="cx">
</span><span class="cx"> this._bottomOverflowShadowElement = document.createElement("div");
</span><span class="lines">@@ -292,9 +292,26 @@
</span><span class="cx"> // Implemented by subclasses if needed.
</span><span class="cx"> },
</span><span class="cx">
</span><del>- applyFiltersToTreeElement: function(treeElement)
</del><ins>+ updateFilter: function(dontExpandOnMatch)
</ins><span class="cx"> {
</span><del>- if (!this._filterBar.hasActiveFilters()) {
</del><ins>+ this._updateFilter(dontExpandOnMatch);
+ },
+
+ hasCustomFilters: function()
+ {
+ // Implemented by subclasses if needed.
+ return false;
+ },
+
+ matchTreeElementAgainstCustomFilters: function(treeElement)
+ {
+ // Implemented by subclasses if needed.
+ return true;
+ },
+
+ applyFiltersToTreeElement: function(treeElement, dontExpandOnMatch)
+ {
+ if (!this._filterBar.hasActiveFilters() && !this.hasCustomFilters()) {
</ins><span class="cx"> // No filters, so make everything visible.
</span><span class="cx"> treeElement.hidden = false;
</span><span class="cx">
</span><span class="lines">@@ -307,26 +324,23 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Get the filterable data from the tree element.
- var filterableData = treeElement.filterableData;
- if (!filterableData)
- return;
</del><ins>+ var filterableData = treeElement.filterableData || {};
</ins><span class="cx">
</span><span class="cx"> var self = this;
</span><del>- function matchTextFilter(input)
</del><ins>+ function matchTextFilter(inputs)
</ins><span class="cx"> {
</span><del>- if (!self._textFilterRegex)
</del><ins>+ if (!inputs || !self._textFilterRegex)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // Convert to a single item array if needed.
</span><del>- if (!(input instanceof Array))
- input = [input];
</del><ins>+ if (!(inputs instanceof Array))
+ inputs = [inputs];
</ins><span class="cx">
</span><span class="cx"> // Loop over all the inputs and try to match them.
</span><del>- for (var i = 0; i < input.length; ++i) {
- if (!input[i])
</del><ins>+ for (var input of inputs) {
+ if (!input)
</ins><span class="cx"> continue;
</span><del>- if (self._textFilterRegex.test(input[i]))
</del><ins>+ if (self._textFilterRegex.test(input))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -344,7 +358,7 @@
</span><span class="cx"> while (currentAncestor && !currentAncestor.root) {
</span><span class="cx"> currentAncestor.hidden = false;
</span><span class="cx">
</span><del>- if (!currentAncestor.expanded) {
</del><ins>+ if (!currentAncestor.expanded && !dontExpandOnMatch) {
</ins><span class="cx"> currentAncestor.__wasExpandedDuringFiltering = true;
</span><span class="cx"> currentAncestor.expand();
</span><span class="cx"> }
</span><span class="lines">@@ -353,7 +367,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (matchTextFilter(filterableData.text)) {
</del><ins>+ if (matchTextFilter(filterableData.text) && this.matchTreeElementAgainstCustomFilters(treeElement)) {
</ins><span class="cx"> // Make this element visible since it matches.
</span><span class="cx"> makeVisible();
</span><span class="cx"> return;
</span><span class="lines">@@ -449,8 +463,13 @@
</span><span class="cx"> this._emptyFilterResults = true;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _updateFilter: function()
</del><ins>+ _textFilterDidChange: function()
</ins><span class="cx"> {
</span><ins>+ this._updateFilter();
+ },
+
+ _updateFilter: function(dontExpandOnMatch)
+ {
</ins><span class="cx"> var filters = this._filterBar.filters;
</span><span class="cx"> this._textFilterRegex = simpleGlobStringToRegExp(filters.text, "i");
</span><span class="cx"> this._filtersSetting.value = filters;
</span><span class="lines">@@ -458,7 +477,7 @@
</span><span class="cx"> // Update the whole tree.
</span><span class="cx"> var currentTreeElement = this._contentTreeOutline.children[0];
</span><span class="cx"> while (currentTreeElement && !currentTreeElement.root) {
</span><del>- this.applyFiltersToTreeElement(currentTreeElement);
</del><ins>+ this.applyFiltersToTreeElement(currentTreeElement, dontExpandOnMatch);
</ins><span class="cx"> currentTreeElement = currentTreeElement.traverseNextTreeElement(false, null, false);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceTimelineContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/TimelineContentView.js (162413 => 162414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/TimelineContentView.js 2014-01-21 02:55:38 UTC (rev 162413)
+++ trunk/Source/WebInspectorUI/UserInterface/TimelineContentView.js 2014-01-21 02:55:44 UTC (rev 162414)
</span><span class="lines">@@ -149,6 +149,44 @@
</span><span class="cx"> this._currentTimelineView.updateLayout();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ matchTreeElementAgainstCustomFilters: function(treeElement)
+ {
+ var startTime = this._timelineOverview.selectionStartTime;
+ var endTime = this._timelineOverview.selectionStartTime + this._timelineOverview.selectionDuration;
+ var currentTime = this._currentTimeMarker.time || WebInspector.timelineManager.recording.startTime;
+
+ function checkTimeBounds(itemStartTime, itemEndTime)
+ {
+ itemStartTime = itemStartTime || currentTime;
+ itemEndTime = itemEndTime || currentTime;
+
+ return startTime <= itemEndTime && itemStartTime <= endTime;
+ }
+
+ if (treeElement instanceof WebInspector.ResourceTreeElement) {
+ var resource = treeElement.resource;
+ return checkTimeBounds(resource.requestSentTimestamp, resource.finishedOrFailedTimestamp);
+ }
+
+ if (treeElement instanceof WebInspector.SourceCodeTimelineTreeElement) {
+ var sourceCodeTimeline = treeElement.sourceCodeTimeline;
+
+ // Do a quick check of the timeline bounds before we check each record.
+ if (!checkTimeBounds(sourceCodeTimeline.startTime, sourceCodeTimeline.endTime))
+ return false;
+
+ for (var record of sourceCodeTimeline.records) {
+ if (checkTimeBounds(record.startTime, record.endTime))
+ return true;
+ }
+
+ return false;
+ }
+
+ console.error("Unknown TreeElement, can't filter by time.");
+ return true;
+ },
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _pathComponentSelected: function(event)
</span><span class="lines">@@ -273,5 +311,8 @@
</span><span class="cx"> this._currentTimelineView.zeroTime = this._timelineOverview.startTime;
</span><span class="cx"> this._currentTimelineView.startTime = this._timelineOverview.selectionStartTime;
</span><span class="cx"> this._currentTimelineView.endTime = this._timelineOverview.selectionStartTime + this._timelineOverview.selectionDuration;
</span><ins>+
+ // Delay until the next frame to stay in sync with the current timeline view's time-based layout changes.
+ requestAnimationFrame(function() { WebInspector.timelineSidebarPanel.updateFilter(true); });
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceTimelineSidebarPanelcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/TimelineSidebarPanel.css (162413 => 162414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/TimelineSidebarPanel.css 2014-01-21 02:55:38 UTC (rev 162413)
+++ trunk/Source/WebInspectorUI/UserInterface/TimelineSidebarPanel.css 2014-01-21 02:55:44 UTC (rev 162414)
</span><span class="lines">@@ -118,7 +118,8 @@
</span><span class="cx"> opacity: 0.8;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.sidebar > .panel.timeline > .content {
</del><ins>+.sidebar > .panel.timeline > .content,
+.sidebar > .panel.timeline > .empty-content-placeholder {
</ins><span class="cx"> top: 175px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/TimelineSidebarPanel.js (162413 => 162414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/TimelineSidebarPanel.js 2014-01-21 02:55:38 UTC (rev 162413)
+++ trunk/Source/WebInspectorUI/UserInterface/TimelineSidebarPanel.js 2014-01-21 02:55:44 UTC (rev 162414)
</span><span class="lines">@@ -180,6 +180,19 @@
</span><span class="cx"> this._stripeBackgroundElement.style.height = contentHeight + "px";
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ hasCustomFilters: function()
+ {
+ return true;
+ },
+
+ matchTreeElementAgainstCustomFilters: function(treeElement)
+ {
+ if (!this._timelineContentView)
+ return true;
+
+ return this._timelineContentView.matchTreeElementAgainstCustomFilters(treeElement);
+ },
+
</ins><span class="cx"> canShowDifferentContentView: function()
</span><span class="cx"> {
</span><span class="cx"> return !this.restoringState || !this._restoredShowingTimelineContentView;
</span></span></pre>
</div>
</div>
</body>
</html>