<!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>[201007] branches/safari-602.1.32-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/201007">201007</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-17 01:47:09 -0700 (Tue, 17 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200708">r200708</a>. rdar://problem/26228913</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchSourceWebInspectorUIChangeLog">branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsHeapAllocationsTimelineViewjs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsMemoryTimelineViewjs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.js</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsScriptClusterTimelineViewjs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ScriptClusterTimelineView.js</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsScriptProfileTimelineViewjs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ScriptProfileTimelineView.js</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsTimelineViewjs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog (201006 => 201007)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-17 08:47:06 UTC (rev 201006)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-17 08:47:09 UTC (rev 201007)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2016-05-17 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r200708. rdar://problem/26228913
+
+ 2016-05-11 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Hide filter bar in TimelineViews where it is not needed or not yet working
+ https://bugs.webkit.org/show_bug.cgi?id=157583
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/HeapAllocationsTimelineView.js:
+ (WebInspector.HeapAllocationsTimelineView.prototype.get showsFilterBar):
+ (WebInspector.HeapAllocationsTimelineView.prototype.layout):
+ (WebInspector.HeapAllocationsTimelineView.prototype.updateFilter):
+ Filter bar not yet hooked up for HeapSnapshot views.
+ Make filtering work for the main timeline grid.
+ It doesn't use the normal TimelineView filter based on selected range.
+ This is intentional because it may be the case that a snapshot happens
+ outside the selected time range (via the navigation bar button) and
+ we want to show it. Otherwise a user might be confused why it is not
+ showing up in the list.
+
+ * UserInterface/Views/MemoryTimelineView.js:
+ (WebInspector.MemoryTimelineView.prototype.get showsFilterBar):
+ Filter bar not needed in the Memory timeline view.
+
+ * UserInterface/Views/ScriptClusterTimelineView.js:
+ (WebInspector.ScriptClusterTimelineView.prototype.get showsFilterBar):
+ Filter bar works for the Events timeline view.
+
+ * UserInterface/Views/ScriptProfileTimelineView.js:
+ (WebInspector.ScriptProfileTimelineView.prototype.get showsFilterBar):
+ Filter bar not yet hooked up for Profile views.
+
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype._currentContentViewDidChange):
+ (WebInspector.TimelineRecordingContentView.prototype._contentViewSelectionPathComponentDidChange):
+ (WebInspector.TimelineRecordingContentView.prototype._updateFilterBar):
+ Update the filter bar when the selection path components change, since
+ that triggers when arbitrarily deep sub-content-views change.
+
+ * UserInterface/Views/TimelineView.js:
+ (WebInspector.TimelineView.prototype.get showsFilterBar):
+ Default is yes.
+
</ins><span class="cx"> 2016-05-11 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r200649.
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsHeapAllocationsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js (201006 => 201007)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js 2016-05-17 08:47:06 UTC (rev 201006)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js 2016-05-17 08:47:09 UTC (rev 201007)
</span><span class="lines">@@ -153,6 +153,9 @@
</span><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><ins>+ // FIXME: <https://webkit.org/b/157582> Web Inspector: Heap Snapshot Views should be searchable
+ get showsFilterBar() { return this._showingSnapshotList; }
+
</ins><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><span class="cx"> if (this._showingSnapshotList) {
</span><span class="lines">@@ -226,6 +229,7 @@
</span><span class="cx"> layout()
</span><span class="cx"> {
</span><span class="cx"> // Wait to show records until our zeroTime has been set.
</span><ins>+ // FIXME: Waiting until zero time causes snapshots taken without recording to not show up in the list.
</ins><span class="cx"> if (this._pendingRecords.length && this.zeroTime) {
</span><span class="cx"> for (let heapAllocationsTimelineRecord of this._pendingRecords) {
</span><span class="cx"> let dataGridNode = new WebInspector.HeapAllocationsTimelineDataGridNode(heapAllocationsTimelineRecord, this.zeroTime, this);
</span><span class="lines">@@ -248,6 +252,11 @@
</span><span class="cx"> this._updateCompareHeapSnapshotButton();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ updateFilter(filters)
+ {
+ this._dataGrid.filterText = filters ? filters.text : "";
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _heapAllocationsTimelineRecordAdded(event)
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsMemoryTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.js (201006 => 201007)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.js 2016-05-17 08:47:06 UTC (rev 201006)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.js 2016-05-17 08:47:09 UTC (rev 201007)
</span><span class="lines">@@ -153,6 +153,8 @@
</span><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><ins>+ get showsFilterBar() { return false; }
+
</ins><span class="cx"> layout()
</span><span class="cx"> {
</span><span class="cx"> // Always update timeline ruler.
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsScriptClusterTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ScriptClusterTimelineView.js (201006 => 201007)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ScriptClusterTimelineView.js 2016-05-17 08:47:06 UTC (rev 201006)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ScriptClusterTimelineView.js 2016-05-17 08:47:09 UTC (rev 201007)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Determine a better way to bridge TimelineView methods to the sub-timeline views.
</span><span class="cx"> get showsLiveRecordingData() { return this._contentViewContainer.currentContentView.showsLiveRecordingData; }
</span><ins>+ get showsFilterBar() { return this._contentViewContainer.currentContentView.showsFilterBar; }
</ins><span class="cx"> get zeroTime() { return this._contentViewContainer.currentContentView.zeroTime; }
</span><span class="cx"> set zeroTime(x) { this._contentViewContainer.currentContentView.zeroTime = x; }
</span><span class="cx"> get startTime() { return this._contentViewContainer.currentContentView.startTime; }
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsScriptProfileTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ScriptProfileTimelineView.js (201006 => 201007)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ScriptProfileTimelineView.js 2016-05-17 08:47:06 UTC (rev 201006)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ScriptProfileTimelineView.js 2016-05-17 08:47:09 UTC (rev 201007)
</span><span class="lines">@@ -69,6 +69,9 @@
</span><span class="cx">
</span><span class="cx"> get showsLiveRecordingData() { return false; }
</span><span class="cx">
</span><ins>+ // FIXME: <https://webkit.org/b/157581> Web Inspector: Script ProfileViews should be searchable
+ get showsFilterBar() { return false; }
+
</ins><span class="cx"> // Protected
</span><span class="cx">
</span><span class="cx"> closed()
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (201006 => 201007)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-05-17 08:47:06 UTC (rev 201006)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-05-17 08:47:09 UTC (rev 201007)
</span><span class="lines">@@ -275,6 +275,7 @@
</span><span class="cx"> this._timelineOverview.viewMode = newViewMode;
</span><span class="cx"> this._updateTimelineOverviewHeight();
</span><span class="cx"> this._updateProgressView();
</span><ins>+ this._updateFilterBar();
</ins><span class="cx">
</span><span class="cx"> if (timelineView) {
</span><span class="cx"> this._updateTimelineViewTimes(timelineView);
</span><span class="lines">@@ -317,6 +318,8 @@
</span><span class="cx"> if (event.target !== this._timelineContentBrowser.currentContentView)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ this._updateFilterBar();
+
</ins><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
</span><span class="cx">
</span><span class="cx"> if (this.currentTimelineView === this._overviewTimelineView)
</span><span class="lines">@@ -735,4 +738,9 @@
</span><span class="cx"> let isCapturing = WebInspector.timelineManager.isCapturing();
</span><span class="cx"> this._progressView.visible = isCapturing && this.currentTimelineView && !this.currentTimelineView.showsLiveRecordingData;
</span><span class="cx"> }
</span><ins>+
+ _updateFilterBar()
+ {
+ this._filterBarNavigationItem.hidden = !this.currentTimelineView || !this.currentTimelineView.showsFilterBar;
+ }
</ins><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (201006 => 201007)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2016-05-17 08:47:06 UTC (rev 201006)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2016-05-17 08:47:09 UTC (rev 201007)
</span><span class="lines">@@ -49,6 +49,12 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get showsFilterBar()
+ {
+ // Implemented by sub-classes if needed.
+ return true;
+ }
+
</ins><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><span class="cx"> return this._scopeBar ? [this._scopeBar] : [];
</span></span></pre>
</div>
</div>
</body>
</html>