<!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>[183762] 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/183762">183762</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-05-04 12:33:38 -0700 (Mon, 04 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Switching recordings in the Timeline navigation bar is broken
https://bugs.webkit.org/show_bug.cgi?id=144519
Reviewed by Joseph Pecoraro.
* UserInterface/Views/ContentBrowser.js:
(WebInspector.ContentBrowser.prototype._hierarchicalPathComponentWasSelected): Use revealAndSelect
on the TreeElement instead of showing the representedObject directly. This fixes an exception in
TimelineRecordingContentView where it wouldn't be initialized with the TimelineSidebarPanel extra argument.
* UserInterface/Views/TimelineOverview.js:
(WebInspector.TimelineOverview.prototype.get visibleDuration): Fix an annoying assert. We show the view
early in construction, before it is in the document. Future updateLayout calls work and fix this.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView.prototype.shown): Call _currentContentViewDidChange
to trigger the sidebar to update when this recording view is shown.
* UserInterface/Views/TimelineSidebarPanel.js:
(WebInspector.TimelineSidebarPanel.prototype._recordingsTreeElementSelected): Moved code from here...
(WebInspector.TimelineSidebarPanel.prototype._recordingSelected): ... to here. Take two different paths
to state restoration here. If the view existed before, use its state. If now, use the current state that
is captured by the cookie logic and explicitly restore it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/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 (183761 => 183762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-04 19:28:23 UTC (rev 183761)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-04 19:33:38 UTC (rev 183762)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-05-04 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Switching recordings in the Timeline navigation bar is broken
+ https://bugs.webkit.org/show_bug.cgi?id=144519
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/ContentBrowser.js:
+ (WebInspector.ContentBrowser.prototype._hierarchicalPathComponentWasSelected): Use revealAndSelect
+ on the TreeElement instead of showing the representedObject directly. This fixes an exception in
+ TimelineRecordingContentView where it wouldn't be initialized with the TimelineSidebarPanel extra argument.
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview.prototype.get visibleDuration): Fix an annoying assert. We show the view
+ early in construction, before it is in the document. Future updateLayout calls work and fix this.
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype.shown): Call _currentContentViewDidChange
+ to trigger the sidebar to update when this recording view is shown.
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.prototype._recordingsTreeElementSelected): Moved code from here...
+ (WebInspector.TimelineSidebarPanel.prototype._recordingSelected): ... to here. Take two different paths
+ to state restoration here. If the view existed before, use its state. If now, use the current state that
+ is captured by the cookie logic and explicitly restore it.
+
</ins><span class="cx"> 2015-05-03 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Exception under ContentViewContainer _disassociateFromContentView
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js (183761 => 183762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-05-04 19:28:23 UTC (rev 183761)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-05-04 19:33:38 UTC (rev 183762)
</span><span class="lines">@@ -573,7 +573,7 @@
</span><span class="cx"> if (!treeElement)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this.showContentViewForRepresentedObject(treeElement.representedObject);
</del><ins>+ treeElement.revealAndSelect();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (183761 => 183762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-05-04 19:28:23 UTC (rev 183761)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-05-04 19:33:38 UTC (rev 183762)
</span><span class="lines">@@ -184,7 +184,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (isNaN(this._cachedScrollContainerWidth)) {
</span><span class="cx"> this._cachedScrollContainerWidth = this._scrollContainerElement.offsetWidth;
</span><del>- console.assert(this._cachedScrollContainerWidth > 0);
</del><ins>+ if (!this._cachedScrollContainerWidth)
+ this._cachedScrollContainerWidth = NaN;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return this._cachedScrollContainerWidth * this._durationPerPixel;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (183761 => 183762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-05-04 19:28:23 UTC (rev 183761)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-05-04 19:33:38 UTC (rev 183762)
</span><span class="lines">@@ -170,6 +170,8 @@
</span><span class="cx"> this._contentViewContainer.shown();
</span><span class="cx"> this._clearTimelineNavigationItem.enabled = this._recording.isWritable();
</span><span class="cx">
</span><ins>+ this._currentContentViewDidChange();
+
</ins><span class="cx"> if (!this._updating && WebInspector.timelineManager.activeRecording === this._recording && WebInspector.timelineManager.isCapturing())
</span><span class="cx"> this._startUpdatingCurrentTime();
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (183761 => 183762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-05-04 19:28:23 UTC (rev 183761)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-05-04 19:33:38 UTC (rev 183762)
</span><span class="lines">@@ -395,20 +395,8 @@
</span><span class="cx"> _recordingsTreeElementSelected(treeElement, selectedByUser)
</span><span class="cx"> {
</span><span class="cx"> console.assert(treeElement.representedObject instanceof WebInspector.TimelineRecording);
</span><del>- console.assert(!selectedByUser, "Recording tree elements should be hidden and only programmatically selectable.");
</del><span class="cx">
</span><span class="cx"> this._recordingSelected(treeElement.representedObject);
</span><del>-
- // Deselect or re-select the timeline tree element for the timeline view being displayed.
- var currentTimelineView = this._displayedContentView.currentTimelineView;
- if (currentTimelineView && currentTimelineView.representedObject instanceof WebInspector.Timeline) {
- var wasSelectedByUser = false; // This is a simulated selection.
- var shouldSuppressOnSelect = false;
- this._timelineTreeElementMap.get(currentTimelineView.representedObject).select(true, wasSelectedByUser, shouldSuppressOnSelect, true);
- } else if (this._timelinesTreeOutline.selectedTreeElement)
- this._timelinesTreeOutline.selectedTreeElement.deselect();
-
- this.updateFilter();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _renderingFrameTimelineTimesUpdated(event)
</span><span class="lines">@@ -503,9 +491,32 @@
</span><span class="cx"> for (var timeline of recording.timelines.values())
</span><span class="cx"> this._timelineAdded(timeline);
</span><span class="cx">
</span><del>- this._displayedContentView = this.contentBrowser.contentViewForRepresentedObject(this._displayedRecording, false, {timelineSidebarPanel: this});
- if (this.selected)
- this.contentBrowser.showContentView(this._displayedContentView);
</del><ins>+ // Save the current state incase we need to restore it to a new recording.
+ var cookie = {};
+ this.saveStateToCookie(cookie);
+
+ // Try to get the recording content view if it exists already, if it does we don't want to restore the cookie.
+ var onlyExisting = true;
+ this._displayedContentView = this.contentBrowser.contentViewForRepresentedObject(this._displayedRecording, onlyExisting, {timelineSidebarPanel: this});
+ if (this._displayedContentView) {
+ // Show the timeline that was being shown to update the sidebar tree state.
+ var currentTimelineView = this._displayedContentView.currentTimelineView;
+ if (currentTimelineView && currentTimelineView.representedObject instanceof WebInspector.Timeline)
+ this.showTimelineViewForTimeline(currentTimelineView.representedObject);
+ else
+ this.showTimelineOverview();
+
+ this.updateFilter();
+ return;
+ }
+
+ onlyExisting = false;
+ this._displayedContentView = this.contentBrowser.contentViewForRepresentedObject(this._displayedRecording, onlyExisting, {timelineSidebarPanel: this});
+
+ // Restore the cookie to carry over the previous recording view state to the new recording.
+ this.restoreStateFromCookie(cookie);
+
+ this.updateFilter();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _recordingLoaded(event)
</span><span class="lines">@@ -534,6 +545,7 @@
</span><span class="cx"> button.addEventListener(WebInspector.TreeElementStatusButton.Event.Clicked, this.showTimelineOverview, this);
</span><span class="cx"> timelineTreeElement.status = button.element;
</span><span class="cx"> }.bind(this));
</span><ins>+
</ins><span class="cx"> this._timelinesTreeOutline.appendChild(timelineTreeElement);
</span><span class="cx"> this._timelineTreeElementMap.set(timeline, timelineTreeElement);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>