<!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>[202011] 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/202011">202011</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-06-13 15:44:26 -0700 (Mon, 13 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Filter Records not applying to new records
https://bugs.webkit.org/show_bug.cgi?id=158213
<rdar://problem/26543912>
Reviewed by Timothy Hatcher.
This patch makes the following improvements to timeline grid filtering:
- Records are filtered as they are added to the grid.
- Timeline view no longer triggers a filter refresh while the
current time changes while recording.
- Filters are refreshed whenever the current timeline view changes.
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid.prototype.hasFilters):
Helper function to check for custom and text filters.
(WebInspector.DataGrid.prototype._applyFiltersToNodeAndDispatchEvent):
Encapsulate node state change and event dispatch, which was previously
done in multiple places.
(WebInspector.DataGrid.prototype.insertChild):
Filter incoming node if needed.
(WebInspector.DataGrid.prototype._updateFilter.createIteratorForNodesToBeFiltered):
(WebInspector.DataGrid.prototype._updateFilter):
(WebInspector.DataGrid.prototype.yieldableTaskWillProcessItem):
Use new convenience functions.
(WebInspector.DataGrid.prototype.hasCustomFilters): Deleted.
Renamed `hasFilters`.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView.prototype._currentContentViewDidChange):
Refresh grid filters on view change.
* UserInterface/Views/TimelineView.js:
(WebInspector.TimelineView.prototype.set startTime):
(WebInspector.TimelineView.prototype.set endTime):
Schedule filter change notification when selection bounds changes.
(WebInspector.TimelineView.prototype._timesDidChange):
(WebInspector.TimelineView.prototype._scheduleFilterDidChange):
(WebInspector.TimelineView):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (202010 => 202011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-06-13 22:43:20 UTC (rev 202010)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-06-13 22:44:26 UTC (rev 202011)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2016-06-13 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Filter Records not applying to new records
+ https://bugs.webkit.org/show_bug.cgi?id=158213
+ <rdar://problem/26543912>
+
+ Reviewed by Timothy Hatcher.
+
+ This patch makes the following improvements to timeline grid filtering:
+
+ - Records are filtered as they are added to the grid.
+ - Timeline view no longer triggers a filter refresh while the
+ current time changes while recording.
+ - Filters are refreshed whenever the current timeline view changes.
+
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid.prototype.hasFilters):
+ Helper function to check for custom and text filters.
+
+ (WebInspector.DataGrid.prototype._applyFiltersToNodeAndDispatchEvent):
+ Encapsulate node state change and event dispatch, which was previously
+ done in multiple places.
+
+ (WebInspector.DataGrid.prototype.insertChild):
+ Filter incoming node if needed.
+
+ (WebInspector.DataGrid.prototype._updateFilter.createIteratorForNodesToBeFiltered):
+ (WebInspector.DataGrid.prototype._updateFilter):
+ (WebInspector.DataGrid.prototype.yieldableTaskWillProcessItem):
+ Use new convenience functions.
+
+ (WebInspector.DataGrid.prototype.hasCustomFilters): Deleted.
+ Renamed `hasFilters`.
+
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype._currentContentViewDidChange):
+ Refresh grid filters on view change.
+
+ * UserInterface/Views/TimelineView.js:
+ (WebInspector.TimelineView.prototype.set startTime):
+ (WebInspector.TimelineView.prototype.set endTime):
+ Schedule filter change notification when selection bounds changes.
+
+ (WebInspector.TimelineView.prototype._timesDidChange):
+ (WebInspector.TimelineView.prototype._scheduleFilterDidChange):
+ (WebInspector.TimelineView):
+
</ins><span class="cx"> 2016-06-13 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Call Trees view should have a 'Top Functions'-like mode
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (202010 => 202011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-06-13 22:43:20 UTC (rev 202010)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-06-13 22:44:26 UTC (rev 202011)
</span><span class="lines">@@ -364,9 +364,9 @@
</span><span class="cx"> this._scheduledFilterUpdateIdentifier = requestAnimationFrame(this._updateFilter.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- hasCustomFilters()
</del><ins>+ hasFilters()
</ins><span class="cx"> {
</span><del>- return this._hasFilterDelegate();
</del><ins>+ return this._textFilterRegex || this._hasFilterDelegate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> matchNodeAgainstCustomFilters(node)
</span><span class="lines">@@ -387,9 +387,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _applyFiltersToNodeAndDispatchEvent(node)
+ {
+ const nodeWasHidden = node.hidden;
+ this._applyFiltersToNode(node);
+ if (nodeWasHidden !== node.hidden)
+ this.dispatchEventToListeners(WebInspector.DataGrid.Event.NodeWasFiltered, {node});
+
+ return nodeWasHidden !== node.hidden;
+ }
+
</ins><span class="cx"> _applyFiltersToNode(node)
</span><span class="cx"> {
</span><del>- if (!this._textFilterRegex && !this.hasCustomFilters()) {
</del><ins>+ if (!this.hasFilters()) {
</ins><span class="cx"> // No filters, so make everything visible.
</span><span class="cx"> node.hidden = false;
</span><span class="cx">
</span><span class="lines">@@ -1195,6 +1205,11 @@
</span><span class="cx">
</span><span class="cx"> if (this.expanded)
</span><span class="cx"> child._attach();
</span><ins>+
+ if (!this.dataGrid.hasFilters())
+ return;
+
+ this.dataGrid._applyFiltersToNodeAndDispatchEvent(child);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> removeChild(child)
</span><span class="lines">@@ -1843,7 +1858,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Don't populate if we don't have any active filters.
</span><span class="cx"> // We only need to populate when a filter needs to reveal.
</span><del>- let dontPopulate = !this._textFilterRegex && !this.hasCustomFilters();
</del><ins>+ let dontPopulate = !this.hasFilters();
</ins><span class="cx">
</span><span class="cx"> let currentNode = this._rows[0];
</span><span class="cx"> while (currentNode && !currentNode.root) {
</span><span class="lines">@@ -1864,13 +1879,9 @@
</span><span class="cx">
</span><span class="cx"> yieldableTaskWillProcessItem(task, node)
</span><span class="cx"> {
</span><del>- const nodeWasHidden = node.hidden;
- this._applyFiltersToNode(node);
- if (nodeWasHidden === node.hidden)
- return;
-
- this.dispatchEventToListeners(WebInspector.DataGrid.Event.NodeWasFiltered, {node});
- this._filterDidModifyNodeWhileProcessingItems = true;
</del><ins>+ let nodeWasModified = this._applyFiltersToNodeAndDispatchEvent(node);
+ if (nodeWasModified)
+ this._filterDidModifyNodeWhileProcessingItems = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> yieldableTaskDidYield(task, processedItems, elapsedTime)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (202010 => 202011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-06-13 22:43:20 UTC (rev 202010)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-06-13 22:44:26 UTC (rev 202011)
</span><span class="lines">@@ -282,6 +282,7 @@
</span><span class="cx">
</span><span class="cx"> if (timelineView) {
</span><span class="cx"> this._updateTimelineViewTimes(timelineView);
</span><ins>+ this._filterDidChange();
</ins><span class="cx">
</span><span class="cx"> let timeline = null;
</span><span class="cx"> if (timelineView.representedObject instanceof WebInspector.Timeline)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (202010 => 202011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2016-06-13 22:43:20 UTC (rev 202010)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2016-06-13 22:44:26 UTC (rev 202011)
</span><span class="lines">@@ -105,6 +105,7 @@
</span><span class="cx"> this._startTime = x;
</span><span class="cx">
</span><span class="cx"> this._timesDidChange();
</span><ins>+ this._scheduleFilterDidChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get endTime()
</span><span class="lines">@@ -122,6 +123,7 @@
</span><span class="cx"> this._endTime = x;
</span><span class="cx">
</span><span class="cx"> this._timesDidChange();
</span><ins>+ this._scheduleFilterDidChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get currentTime()
</span><span class="lines">@@ -323,7 +325,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (!WebInspector.timelineManager.isCapturing() || this.showsLiveRecordingData)
</span><span class="cx"> this.needsLayout();
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ _scheduleFilterDidChange()
+ {
</ins><span class="cx"> if (!this._timelineDataGrid || this._updateFilterTimeout)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>