<!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>[184429] 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/184429">184429</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2015-05-15 20:47:09 -0700 (Fri, 15 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: empty timeline should not use previous timeline's zoom interval
https://bugs.webkit.org/show_bug.cgi?id=132754
Reviewed by Joseph Pecoraro.
When a timeline recording is started in response to a provisional load, TimelineManager should check whether
the main resource url is changing before loading a new timeline recording. If the main resource is changing,
set the selection start, selection duration, and duration-per-pixel settings of the TimelineOverview to their
default values.
* UserInterface/Controllers/TimelineManager.js:
(WebInspector.TimelineManager):
(WebInspector.TimelineManager.prototype.isCapturingPageReload):
(WebInspector.TimelineManager.prototype.capturingStopped):
(WebInspector.TimelineManager.prototype.pageDidLoad):
(WebInspector.TimelineManager.prototype._startAutoCapturing):
Added a property for checking whether auto capture was triggered by a page reload.
* UserInterface/Views/LinearTimelineOverview.js:
(WebInspector.LinearTimelineOverview):
Increase default selection time to 15 seconds.
* UserInterface/Views/TimelineOverview.js:
(WebInspector.TimelineOverview):
Reset selection and zoom if TimelineManager isn't capturing in response to a page reload.
(WebInspector.TimelineOverview.prototype.reset):
Reset selection and zoom.
(WebInspector.TimelineOverview.prototype._timeRangeSelectionChanged):
(WebInspector.TimelineOverview.prototype._resetSelection):
Added a helper function for resetting selection and zoom to their default values.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLinearTimelineOverviewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LinearTimelineOverview.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (184428 => 184429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-16 03:46:25 UTC (rev 184428)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-16 03:47:09 UTC (rev 184429)
</span><span class="lines">@@ -1,5 +1,40 @@
</span><span class="cx"> 2015-05-15 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: empty timeline should not use previous timeline's zoom interval
+ https://bugs.webkit.org/show_bug.cgi?id=132754
+
+ Reviewed by Joseph Pecoraro.
+
+ When a timeline recording is started in response to a provisional load, TimelineManager should check whether
+ the main resource url is changing before loading a new timeline recording. If the main resource is changing,
+ set the selection start, selection duration, and duration-per-pixel settings of the TimelineOverview to their
+ default values.
+
+ * UserInterface/Controllers/TimelineManager.js:
+ (WebInspector.TimelineManager):
+ (WebInspector.TimelineManager.prototype.isCapturingPageReload):
+ (WebInspector.TimelineManager.prototype.capturingStopped):
+ (WebInspector.TimelineManager.prototype.pageDidLoad):
+ (WebInspector.TimelineManager.prototype._startAutoCapturing):
+ Added a property for checking whether auto capture was triggered by a page reload.
+
+ * UserInterface/Views/LinearTimelineOverview.js:
+ (WebInspector.LinearTimelineOverview):
+ Increase default selection time to 15 seconds.
+
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview):
+ Reset selection and zoom if TimelineManager isn't capturing in response to a page reload.
+
+ (WebInspector.TimelineOverview.prototype.reset):
+ Reset selection and zoom.
+
+ (WebInspector.TimelineOverview.prototype._timeRangeSelectionChanged):
+ (WebInspector.TimelineOverview.prototype._resetSelection):
+ Added a helper function for resetting selection and zoom to their default values.
+
+2015-05-15 Matt Baker <mattbaker@apple.com>
+
</ins><span class="cx"> Web Inspector: Timeline data grid displays wrong records after switching between Timelines/Frames mode
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145084
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (184428 => 184429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-05-16 03:46:25 UTC (rev 184428)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-05-16 03:47:09 UTC (rev 184429)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> WebInspector.Frame.addEventListener(WebInspector.Frame.Event.ResourceWasAdded, this._resourceWasAdded, this);
</span><span class="cx">
</span><span class="cx"> this._isCapturing = false;
</span><ins>+ this._isCapturingPageReload = false;
+ this._autoCapturingMainResource = null;
</ins><span class="cx"> this._boundStopCapturing = this.stopCapturing.bind(this);
</span><span class="cx">
</span><span class="cx"> this.reset();
</span><span class="lines">@@ -70,6 +72,11 @@
</span><span class="cx"> return this._isCapturing;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ isCapturingPageReload()
+ {
+ return this._isCapturingPageReload;
+ }
+
</ins><span class="cx"> startCapturing(shouldCreateRecording)
</span><span class="cx"> {
</span><span class="cx"> console.assert(!this._isCapturing, "TimelineManager is already capturing.");
</span><span class="lines">@@ -146,6 +153,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._isCapturing = false;
</span><ins>+ this._isCapturingPageReload = false;
</ins><span class="cx"> this._autoCapturingMainResource = null;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineManager.Event.CapturingStopped);
</span><span class="lines">@@ -164,8 +172,12 @@
</span><span class="cx"> }.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Protected
+
</ins><span class="cx"> pageDidLoad(timestamp)
</span><span class="cx"> {
</span><ins>+ // Called from WebInspector.PageObserver.
+
</ins><span class="cx"> if (isNaN(WebInspector.frameResourceManager.mainFrame.loadEventTimestamp))
</span><span class="cx"> WebInspector.frameResourceManager.mainFrame.markLoadEvent(this.activeRecording.computeElapsedTime(timestamp));
</span><span class="cx"> }
</span><span class="lines">@@ -472,6 +484,9 @@
</span><span class="cx"> if (mainResource === this._autoCapturingMainResource)
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ var oldMainResource = event.target.mainResource || null;
+ this._isCapturingPageReload = oldMainResource !== null && oldMainResource.url === mainResource.url;
+
</ins><span class="cx"> if (this._isCapturing)
</span><span class="cx"> this.stopCapturing();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLinearTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LinearTimelineOverview.js (184428 => 184429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LinearTimelineOverview.js 2015-05-16 03:46:25 UTC (rev 184428)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LinearTimelineOverview.js 2015-05-16 03:47:09 UTC (rev 184429)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> var defaultSettingsValues = {
</span><span class="cx"> durationPerPixel: 0.01,
</span><span class="cx"> selectionStartValue: 0,
</span><del>- selectionDuration: 5
</del><ins>+ selectionDuration: 15
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineOverview.call(this, "linear", timelineRecording, 0.0001, 60, defaultSettingsValues);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (184428 => 184429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-05-16 03:46:25 UTC (rev 184428)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-05-16 03:47:09 UTC (rev 184429)
</span><span class="lines">@@ -60,9 +60,10 @@
</span><span class="cx"> this._scrollWidthSizer.className = WebInspector.TimelineOverview.ScrollWidthSizerStyleClassName;
</span><span class="cx"> this._scrollContainerElement.appendChild(this._scrollWidthSizer);
</span><span class="cx">
</span><del>- this._durationPerPixelSetting = new WebInspector.Setting(identifier + "-timeline-overview-duration-per-pixel", defaultSettingsValues.durationPerPixel);
- this._selectionStartValueSetting = new WebInspector.Setting(identifier + "-timeline-overview-selection-start-value", defaultSettingsValues.selectionStartValue);
- this._selectionDurationSetting = new WebInspector.Setting(identifier + "-timeline-overview-selection-duration", defaultSettingsValues.selectionDuration);
</del><ins>+ this._defaultSettingsValues = defaultSettingsValues;
+ this._durationPerPixelSetting = new WebInspector.Setting(identifier + "-timeline-overview-duration-per-pixel", this._defaultSettingsValues.durationPerPixel);
+ this._selectionStartValueSetting = new WebInspector.Setting(identifier + "-timeline-overview-selection-start-value", this._defaultSettingsValues.selectionStartValue);
+ this._selectionDurationSetting = new WebInspector.Setting(identifier + "-timeline-overview-selection-duration", this._defaultSettingsValues.selectionDuration);
</ins><span class="cx">
</span><span class="cx"> this._startTime = 0;
</span><span class="cx"> this._currentTime = 0;
</span><span class="lines">@@ -79,6 +80,9 @@
</span><span class="cx">
</span><span class="cx"> for (var timeline of this._recording.timelines.values())
</span><span class="cx"> this._timelineAdded(timeline);
</span><ins>+
+ if (!WebInspector.timelineManager.isCapturingPageReload())
+ this._resetSelection();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineOverview.StyleClassName = "timeline-overview";
</span><span class="lines">@@ -245,6 +249,8 @@
</span><span class="cx"> {
</span><span class="cx"> for (var timelineOverviewGraph of this._timelineOverviewGraphsMap.values())
</span><span class="cx"> timelineOverviewGraph.reset();
</span><ins>+
+ this._resetSelection();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> addMarker: function(marker)
</span><span class="lines">@@ -442,5 +448,12 @@
</span><span class="cx"> this._selectionDurationSetting.value = this.selectionDuration;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineOverview.Event.TimeRangeSelectionChanged);
</span><del>- }
</del><ins>+ },
+
+ _resetSelection: function()
+ {
+ this.secondsPerPixel = this._defaultSettingsValues.durationPerPixel;
+ this.selectionStartTime = this._defaultSettingsValues.selectionStartValue;
+ this.selectionDuration = this._defaultSettingsValues.selectionDuration;
+ },
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>