<!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>[178315] 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/178315">178315</a></dd>
<dt>Author</dt> <dd>jonowells@apple.com</dd>
<dt>Date</dt> <dd>2015-01-12 21:18:01 -0800 (Mon, 12 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Timeline: when Network Requests view is selected, in progress requests are absent.
https://bugs.webkit.org/show_bug.cgi?id=140090
Reviewed by Timothy Hatcher.
TimelineContentView#_updateTimes() changed to call WebInspector.timelineSidebarPanel.updateFilter() in addition
to updating the layout of the current timeline view. TimelineSidebarPanel.updateFilter() now responsible for
updating filtered resources in a TimelineView.
* UserInterface/Views/NavigationSidebarPanel.js:
(WebInspector.NavigationSidebarPanel.prototype._updateFilter):
Now handles updating the UI associated with filtering of navigation sidebar tree elements.
* UserInterface/Views/OverviewTimelineView.js:
(WebInspector.OverviewTimelineView.prototype.updateLayout):
No longer handles updating other UI along with the navigation sidebar tree elements. That is now handled by
WebInspector.TimelineView.prototype.filterUpdated.
(WebInspector.OverviewTimelineView.prototype._compareTreeElementsByDetails): Drive-by fix. Missing vars.
* UserInterface/Views/TimelineContentView.js:
(WebInspector.TimelineContentView.prototype._updateTimes): Add call to updateFilter().
* UserInterface/Views/TimelineView.js:
(WebInspector.TimelineView.prototype.filterUpdated):
Function added to dispatch a SelectionPathComponentsDidChange event.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsOverviewTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineContentView.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 (178314 => 178315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-01-13 03:26:09 UTC (rev 178314)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-01-13 05:18:01 UTC (rev 178315)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-01-12 Jonathan Wells <jonowells@apple.com>
+
+ Web Inspector: Timeline: when Network Requests view is selected, in progress requests are absent.
+ https://bugs.webkit.org/show_bug.cgi?id=140090
+
+ Reviewed by Timothy Hatcher.
+
+ TimelineContentView#_updateTimes() changed to call WebInspector.timelineSidebarPanel.updateFilter() in addition
+ to updating the layout of the current timeline view. TimelineSidebarPanel.updateFilter() now responsible for
+ updating filtered resources in a TimelineView.
+
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel.prototype._updateFilter):
+ Now handles updating the UI associated with filtering of navigation sidebar tree elements.
+
+ * UserInterface/Views/OverviewTimelineView.js:
+ (WebInspector.OverviewTimelineView.prototype.updateLayout):
+ No longer handles updating other UI along with the navigation sidebar tree elements. That is now handled by
+ WebInspector.TimelineView.prototype.filterUpdated.
+ (WebInspector.OverviewTimelineView.prototype._compareTreeElementsByDetails): Drive-by fix. Missing vars.
+
+ * UserInterface/Views/TimelineContentView.js:
+ (WebInspector.TimelineContentView.prototype._updateTimes): Add call to updateFilter().
+
+ * UserInterface/Views/TimelineView.js:
+ (WebInspector.TimelineView.prototype.filterUpdated):
+ Function added to dispatch a SelectionPathComponentsDidChange event.
+
</ins><span class="cx"> 2015-01-09 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Support additional text styles.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (178314 => 178315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-01-13 03:26:09 UTC (rev 178314)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-01-13 05:18:01 UTC (rev 178315)
</span><span class="lines">@@ -497,6 +497,9 @@
</span><span class="cx">
</span><span class="cx"> _updateFilter: function()
</span><span class="cx"> {
</span><ins>+ var selectedTreeElement = this._contentTreeOutline.selectedTreeElement;
+ var selectionWasHidden = selectedTreeElement && selectedTreeElement.hidden;
+
</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">@@ -514,6 +517,13 @@
</span><span class="cx">
</span><span class="cx"> this._checkForEmptyFilterResults();
</span><span class="cx"> this._updateContentOverflowShadowVisibility();
</span><ins>+
+ // Filter may have hidden the selected resource in the timeline view, which should now notify its listeners.
+ if (selectedTreeElement && selectedTreeElement.hidden !== selectionWasHidden) {
+ var currentContentView = WebInspector.contentBrowser.currentContentView;
+ if (currentContentView instanceof WebInspector.TimelineContentView && typeof currentContentView.currentTimelineView.filterUpdated === "function")
+ currentContentView.currentTimelineView.filterUpdated();
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _treeElementAddedOrChanged: function(treeElement)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsOverviewTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js (178314 => 178315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2015-01-13 03:26:09 UTC (rev 178314)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2015-01-13 05:18:01 UTC (rev 178315)
</span><span class="lines">@@ -112,17 +112,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (this.currentTime !== oldCurrentTime) {
- var selectedTreeElement = this.navigationSidebarTreeOutline.selectedTreeElement;
- var selectionWasHidden = selectedTreeElement && selectedTreeElement.hidden;
-
- // Check the filters again since the current time change might have revealed this node. Start and end time changes are handled by TimelineContentView.
- WebInspector.timelineSidebarPanel.updateFilter();
-
- if (selectedTreeElement && selectedTreeElement.hidden !== selectionWasHidden)
- this.dispatchEventToListeners(WebInspector.TimelineView.Event.SelectionPathComponentsDidChange);
- }
-
</del><span class="cx"> this._timelineRuler.updateLayout();
</span><span class="cx">
</span><span class="cx"> this._processPendingRepresentedObjects();
</span><span class="lines">@@ -175,8 +164,8 @@
</span><span class="cx"> return 1;
</span><span class="cx">
</span><span class="cx"> if (a instanceof WebInspector.SourceCodeTimelineTreeElement && b instanceof WebInspector.SourceCodeTimelineTreeElement) {
</span><del>- aTimeline = a.sourceCodeTimeline;
- bTimeline = b.sourceCodeTimeline;
</del><ins>+ var aTimeline = a.sourceCodeTimeline;
+ var bTimeline = b.sourceCodeTimeline;
</ins><span class="cx">
</span><span class="cx"> if (!aTimeline.sourceCodeLocation && !bTimeline.sourceCodeLocation) {
</span><span class="cx"> if (aTimeline.recordType !== bTimeline.recordType)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineContentView.js (178314 => 178315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineContentView.js 2015-01-13 03:26:09 UTC (rev 178314)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineContentView.js 2015-01-13 05:18:01 UTC (rev 178315)
</span><span class="lines">@@ -362,6 +362,8 @@
</span><span class="cx"> this._timelineOverview.currentTime = currentTime;
</span><span class="cx"> this._currentTimelineView.currentTime = currentTime;
</span><span class="cx">
</span><ins>+ WebInspector.timelineSidebarPanel.updateFilter();
+
</ins><span class="cx"> // Force a layout now since we are already in an animation frame and don't need to delay it until the next.
</span><span class="cx"> this._timelineOverview.updateLayoutIfNeeded();
</span><span class="cx"> this._currentTimelineView.updateLayoutIfNeeded();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (178314 => 178315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-01-13 03:26:09 UTC (rev 178314)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-01-13 05:18:01 UTC (rev 178315)
</span><span class="lines">@@ -217,6 +217,11 @@
</span><span class="cx"> this.updateLayout();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ filterUpdated: function()
+ {
+ this.dispatchEventToListeners(WebInspector.TimelineView.Event.SelectionPathComponentsDidChange);
+ },
+
</ins><span class="cx"> // Protected
</span><span class="cx">
</span><span class="cx"> treeElementPathComponentSelected: function(event)
</span></span></pre>
</div>
</div>
</body>
</html>