<!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>[203986] 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/203986">203986</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-08-01 14:03:44 -0700 (Mon, 01 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Waterfall graph in Network tab shows too much whitespace/dead time
https://bugs.webkit.org/show_bug.cgi?id=160373
Reviewed by Timothy Hatcher.
Track the start and end time separate from the ruler to remove
leading/trailing whitespace in the graph. Also prevent network
record bars from being clipped.
* UserInterface/Views/NetworkGridContentView.js:
(WebInspector.NetworkGridContentView):
(WebInspector.NetworkGridContentView.prototype.get zeroTime):
Set equal to the ruler start time.
(WebInspector.NetworkGridContentView.prototype.reset):
Reset start and end time.
(WebInspector.NetworkGridContentView.prototype.layout):
Set the initial values for ruler start/zero time if needed.
(WebInspector.NetworkGridContentView.prototype._networkTimelineRecordAdded):
Set the start time if needed.
Reduce debounce from 250ms to 150ms. This prevents the current time from
exceeding the end time by as wide a margin, while keeping the current
time "timer" from being restarted too frequently.
(WebInspector.NetworkGridContentView.prototype._stopUpdatingCurrentTime):
Update the ruler end time and schedule a layout.
Add padding equal to the time needed to draw a network bar at minimum width
to prevent bars from being clipped.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (203985 => 203986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-08-01 20:49:53 UTC (rev 203985)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-08-01 21:03:44 UTC (rev 203986)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-08-01 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Waterfall graph in Network tab shows too much whitespace/dead time
+ https://bugs.webkit.org/show_bug.cgi?id=160373
+
+ Reviewed by Timothy Hatcher.
+
+ Track the start and end time separate from the ruler to remove
+ leading/trailing whitespace in the graph. Also prevent network
+ record bars from being clipped.
+
+ * UserInterface/Views/NetworkGridContentView.js:
+ (WebInspector.NetworkGridContentView):
+ (WebInspector.NetworkGridContentView.prototype.get zeroTime):
+ Set equal to the ruler start time.
+ (WebInspector.NetworkGridContentView.prototype.reset):
+ Reset start and end time.
+ (WebInspector.NetworkGridContentView.prototype.layout):
+ Set the initial values for ruler start/zero time if needed.
+ (WebInspector.NetworkGridContentView.prototype._networkTimelineRecordAdded):
+ Set the start time if needed.
+ Reduce debounce from 250ms to 150ms. This prevents the current time from
+ exceeding the end time by as wide a margin, while keeping the current
+ time "timer" from being restarted too frequently.
+
+ (WebInspector.NetworkGridContentView.prototype._stopUpdatingCurrentTime):
+ Update the ruler end time and schedule a layout.
+ Add padding equal to the time needed to draw a network bar at minimum width
+ to prevent bars from being clipped.
+
</ins><span class="cx"> 2016-07-29 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Inactive/active network bar segments overlap when latency is zero
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (203985 => 203986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2016-08-01 20:49:53 UTC (rev 203985)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2016-08-01 21:03:44 UTC (rev 203986)
</span><span class="lines">@@ -107,6 +107,8 @@
</span><span class="cx"> this._pendingRecords = [];
</span><span class="cx"> this._loadingResourceCount = 0;
</span><span class="cx"> this._lastUpdateTimestamp = NaN;
</span><ins>+ this._startTime = NaN;
+ this._endTime = NaN;
</ins><span class="cx"> this._scheduledCurrentTimeUpdateIdentifier = undefined;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -116,6 +118,7 @@
</span><span class="cx"> get startTime() { return this._timelineRuler.startTime; }
</span><span class="cx"> get currentTime() { return this.endTime || this.startTime; }
</span><span class="cx"> get endTime() { return this._timelineRuler.endTime; }
</span><ins>+ get zeroTime() { return this._timelineRuler.startTime; }
</ins><span class="cx">
</span><span class="cx"> get selectionPathComponents()
</span><span class="cx"> {
</span><span class="lines">@@ -127,11 +130,6 @@
</span><span class="cx"> return [pathComponent];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- get zeroTime()
- {
- return WebInspector.timelineManager.persistentNetworkTimeline.startTime;
- }
-
</del><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><span class="cx"> return [this._clearNetworkItemsNavigationItem];
</span><span class="lines">@@ -169,6 +167,8 @@
</span><span class="cx">
</span><span class="cx"> this._loadingResourceCount = 0;
</span><span class="cx"> this._lastUpdateTimestamp = NaN;
</span><ins>+ this._startTime = NaN;
+ this._endTime = NaN;
</ins><span class="cx">
</span><span class="cx"> this._timelineRuler.startTime = 0;
</span><span class="cx"> this._timelineRuler.endTime = 0;
</span><span class="lines">@@ -178,8 +178,10 @@
</span><span class="cx">
</span><span class="cx"> layout()
</span><span class="cx"> {
</span><del>- this._timelineRuler.zeroTime = this.zeroTime;
- this._timelineRuler.startTime = this.zeroTime;
</del><ins>+ if (!isNaN(this._startTime)) {
+ this._timelineRuler.zeroTime = this._startTime;
+ this._timelineRuler.startTime = this._startTime;
+ }
</ins><span class="cx">
</span><span class="cx"> if (this.startTime >= this.endTime)
</span><span class="cx"> return;
</span><span class="lines">@@ -219,7 +221,7 @@
</span><span class="cx">
</span><span class="cx"> _networkTimelineRecordAdded(event)
</span><span class="cx"> {
</span><del>- var resourceTimelineRecord = event.data.record;
</del><ins>+ let resourceTimelineRecord = event.data.record;
</ins><span class="cx"> console.assert(resourceTimelineRecord instanceof WebInspector.ResourceTimelineRecord);
</span><span class="cx">
</span><span class="cx"> let update = (event) => {
</span><span class="lines">@@ -233,7 +235,8 @@
</span><span class="cx"> if (this._loadingResourceCount)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this.debounce(250)._stopUpdatingCurrentTime();
</del><ins>+ this._endTime = resourceTimelineRecord.endTime;
+ this.debounce(150)._stopUpdatingCurrentTime();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> this._pendingRecords.push(resourceTimelineRecord);
</span><span class="lines">@@ -249,8 +252,12 @@
</span><span class="cx"> resource.addEventListener(WebInspector.Resource.Event.LoadingDidFail, update, this);
</span><span class="cx">
</span><span class="cx"> this._loadingResourceCount++;
</span><del>- if (this._loadingResourceCount && !this._scheduledCurrentTimeUpdateIdentifier)
</del><ins>+ if (this._loadingResourceCount && !this._scheduledCurrentTimeUpdateIdentifier) {
+ if (isNaN(this._startTime))
+ this._startTime = resourceTimelineRecord.startTime;
+
</ins><span class="cx"> this._startUpdatingCurrentTime();
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _treeElementPathComponentSelected(event)
</span><span class="lines">@@ -325,6 +332,9 @@
</span><span class="cx">
</span><span class="cx"> cancelAnimationFrame(this._scheduledCurrentTimeUpdateIdentifier);
</span><span class="cx"> this._scheduledCurrentTimeUpdateIdentifier = undefined;
</span><ins>+
+ this._timelineRuler.endTime = this._endTime + WebInspector.TimelineRecordBar.MinimumWidthPixels * this.secondsPerPixel;
+ this.needsLayout();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>