<!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>[184336] 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/184336">184336</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2015-05-14 08:33:12 -0700 (Thu, 14 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Current time marker is always at zero in Rendering Frames ruler
https://bugs.webkit.org/show_bug.cgi?id=144518
Reviewed by Timothy Hatcher.
The current and end time values for the rendering frame timeline overview should always be equal to the frame
number of the last record in the rendering frames timeline.
* UserInterface/Views/TimelineOverview.js:
(WebInspector.TimelineOverview):
(WebInspector.TimelineOverview.prototype.updateLayout):
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView.prototype._updateTimes):
(WebInspector.TimelineRecordingContentView.prototype._recordingTimesUpdated):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (184335 => 184336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-14 10:52:20 UTC (rev 184335)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-14 15:33:12 UTC (rev 184336)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-05-14 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Current time marker is always at zero in Rendering Frames ruler
+ https://bugs.webkit.org/show_bug.cgi?id=144518
+
+ Reviewed by Timothy Hatcher.
+
+ The current and end time values for the rendering frame timeline overview should always be equal to the frame
+ number of the last record in the rendering frames timeline.
+
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview):
+ (WebInspector.TimelineOverview.prototype.updateLayout):
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype._updateTimes):
+ (WebInspector.TimelineRecordingContentView.prototype._recordingTimesUpdated):
+
</ins><span class="cx"> 2015-05-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Move Windows build target to Windows 7 (or newer)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (184335 => 184336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-05-14 10:52:20 UTC (rev 184335)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-05-14 15:33:12 UTC (rev 184336)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx">
</span><span class="cx"> this._startTime = 0;
</span><span class="cx"> this._currentTime = 0;
</span><ins>+ this._revealCurrentTime = false;
</ins><span class="cx"> this._endTime = 0;
</span><span class="cx"> this._minimumDurationPerPixel = minimumDurationPerPixel;
</span><span class="cx"> this._maximumDurationPerPixel = maximumDurationPerPixel;
</span><span class="lines">@@ -280,7 +281,7 @@
</span><span class="cx">
</span><span class="cx"> if (this._revealCurrentTime) {
</span><span class="cx"> this.revealMarker(this._currentTimeMarker);
</span><del>- delete this._revealCurrentTime;
</del><ins>+ this._revealCurrentTime = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const visibleDuration = this.visibleDuration;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (184335 => 184336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-05-14 10:52:20 UTC (rev 184335)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-05-14 15:33:12 UTC (rev 184336)
</span><span class="lines">@@ -428,9 +428,12 @@
</span><span class="cx"> if (this.currentTimelineView)
</span><span class="cx"> this.currentTimelineView.currentTime = currentTime;
</span><span class="cx">
</span><del>- if (this._renderingFrameTimeline && this.currentTimelineView.representedObject.type === WebInspector.TimelineRecord.Type.RenderingFrame) {
- var oldEndTime = this._renderingFrameTimelineOverview.endTime;
- this._renderingFrameTimelineOverview.endTime = this._renderingFrameTimeline.records.length;
</del><ins>+ if (this._renderingFrameTimeline) {
+ var currentFrameNumber = 0;
+ if (this._renderingFrameTimeline.records.length)
+ currentFrameNumber = this._renderingFrameTimeline.records.lastValue.frameNumber;
+
+ this._renderingFrameTimelineOverview.currentTime = this._renderingFrameTimelineOverview.endTime = currentFrameNumber;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._timelineSidebarPanel.updateFilter();
</span><span class="lines">@@ -513,6 +516,10 @@
</span><span class="cx"> // We might want to have the backend send a "start" record to get current time moving.
</span><span class="cx">
</span><span class="cx"> for (var timeline of this._recording.timelines.values()) {
</span><ins>+ // The rendering frame timeline doesn't use a time axis.
+ if (timeline.type === WebInspector.TimelineRecord.Type.RenderingFrame)
+ continue;
+
</ins><span class="cx"> var lastRecord = timeline.records.lastValue;
</span><span class="cx"> if (!lastRecord)
</span><span class="cx"> continue;
</span></span></pre>
</div>
</div>
</body>
</html>