<!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>[203920] 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/203920">203920</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-07-29 13:43:42 -0700 (Fri, 29 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Inactive/active network bar segments overlap when latency is zero
https://bugs.webkit.org/show_bug.cgi?id=160147
<rdar://problem/27516007>
Reviewed by Joseph Pecoraro.
TimelineRecordBar should hide the inactive segment when its duration
is less than the minimum displayable size. The active segment can
assume the whole width of the bar.
* UserInterface/Views/TimelineOverviewGraph.js:
(WebInspector.TimelineOverviewGraph.prototype.get secondsPerPixel):
Make secondsPerPixel available during TimelineRecordBars.refresh.
* UserInterface/Views/TimelineRecordBar.js:
(WebInspector.TimelineRecordBar.prototype.refresh):
Check inactive duration against the minimum display size,
and add/remove DOM nodes and bar styles as needed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewGraphjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordBarjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (203919 => 203920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-07-29 20:29:20 UTC (rev 203919)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-07-29 20:43:42 UTC (rev 203920)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-07-29 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Inactive/active network bar segments overlap when latency is zero
+ https://bugs.webkit.org/show_bug.cgi?id=160147
+ <rdar://problem/27516007>
+
+ Reviewed by Joseph Pecoraro.
+
+ TimelineRecordBar should hide the inactive segment when its duration
+ is less than the minimum displayable size. The active segment can
+ assume the whole width of the bar.
+
+ * UserInterface/Views/TimelineOverviewGraph.js:
+ (WebInspector.TimelineOverviewGraph.prototype.get secondsPerPixel):
+ Make secondsPerPixel available during TimelineRecordBars.refresh.
+
+ * UserInterface/Views/TimelineRecordBar.js:
+ (WebInspector.TimelineRecordBar.prototype.refresh):
+ Check inactive duration against the minimum display size,
+ and add/remove DOM nodes and bar styles as needed.
+
</ins><span class="cx"> 2016-07-29 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r195456): Web Inspector: Changing tabs in Styles sidebar shouldn't change sidebar's width
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewGraphjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js (203919 => 203920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js 2016-07-29 20:29:20 UTC (rev 203919)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js 2016-07-29 20:43:42 UTC (rev 203920)
</span><span class="lines">@@ -148,6 +148,8 @@
</span><span class="cx"> return this._timelineOverview;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get secondsPerPixel() { return this._timelineOverview.secondsPerPixel; }
+
</ins><span class="cx"> get visible()
</span><span class="cx"> {
</span><span class="cx"> return this._visible;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordBarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js (203919 => 203920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js 2016-07-29 20:29:20 UTC (rev 203919)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js 2016-07-29 20:43:42 UTC (rev 203920)
</span><span class="lines">@@ -225,6 +225,12 @@
</span><span class="cx">
</span><span class="cx"> refresh(graphDataSource)
</span><span class="cx"> {
</span><ins>+ console.assert(graphDataSource.zeroTime);
+ console.assert(graphDataSource.startTime);
+ console.assert(graphDataSource.currentTime);
+ console.assert(graphDataSource.endTime);
+ console.assert(graphDataSource.secondsPerPixel);
+
</ins><span class="cx"> if (!this._records || !this._records.length)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -303,10 +309,21 @@
</span><span class="cx">
</span><span class="cx"> if (inactiveUnfinished)
</span><span class="cx"> barActiveStartTime = graphCurrentTime;
</span><ins>+ else if (this._renderMode === WebInspector.TimelineRecordBar.RenderMode.Normal) {
+ // Hide the inactive segment when its duration is less than the minimum displayable size.
+ let minimumSegmentDuration = graphDataSource.secondsPerPixel * WebInspector.TimelineRecordBar.MinimumWidthPixels;
+ if (barActiveStartTime - barStartTime < minimumSegmentDuration) {
+ barActiveStartTime = barStartTime;
+ if (this._inactiveBarElement)
+ this._inactiveBarElement.remove();
+ }
+ }
</ins><span class="cx">
</span><del>- var middlePercentage = (barActiveStartTime - barStartTime) / barDuration;
</del><ins>+ let showInactiveSegment = barActiveStartTime > barStartTime;
+ this._element.classList.toggle("has-inactive-segment", showInactiveSegment);
</ins><span class="cx">
</span><del>- if (this._renderMode !== WebInspector.TimelineRecordBar.RenderMode.ActiveOnly) {
</del><ins>+ let middlePercentage = (barActiveStartTime - barStartTime) / barDuration;
+ if (showInactiveSegment && this._renderMode !== WebInspector.TimelineRecordBar.RenderMode.ActiveOnly) {
</ins><span class="cx"> if (!this._inactiveBarElement) {
</span><span class="cx"> this._inactiveBarElement = document.createElement("div");
</span><span class="cx"> this._inactiveBarElement.classList.add("segment");
</span></span></pre>
</div>
</div>
</body>
</html>