<!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>[186471] 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/186471">186471</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2015-07-07 12:58:03 -0700 (Tue, 07 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Pad ruler selection area by 1px in the Rendering Frames timeline overview
https://bugs.webkit.org/show_bug.cgi?id=146248
Reviewed by Timothy Hatcher.
* UserInterface/Views/RenderingFrameTimelineOverview.js:
Enable duration pixel alignment.
* UserInterface/Views/TimelineOverview.css:
(.timeline-overview.frames > .timeline-ruler > .header > .divider):
(.timeline-overview.frames > .timeline-ruler > .selection-handle.right):
(.timeline-overview.frames > .timeline-ruler > .shaded-area.right):
Shift ruler elements 1 pixel to the right, so that selection boundaries and dividers are
positioned inside the gap between frame elements.
* UserInterface/Views/TimelineOverview.js:
(WebInspector.TimelineOverview):
(WebInspector.TimelineOverview.prototype.set secondsPerPixel):
(WebInspector.TimelineOverview.prototype.get pixelAlignDuration):
(WebInspector.TimelineOverview.prototype.set pixelAlignDuration):
(WebInspector.TimelineOverview.prototype._handleWheelEvent):
Added a property to force the overview graph to align duration units on the y-axis to pixel boundaries.
When enabled, frame elements are displayed in integer widths while zooming, preventing subpixel blurring
and maintaining a consistent 1 pixel gap between frames.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineOverviewjs">trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewcss">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.css</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 (186470 => 186471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-07-07 19:24:06 UTC (rev 186470)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-07 19:58:03 UTC (rev 186471)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-07-07 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Pad ruler selection area by 1px in the Rendering Frames timeline overview
+ https://bugs.webkit.org/show_bug.cgi?id=146248
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/RenderingFrameTimelineOverview.js:
+ Enable duration pixel alignment.
+
+ * UserInterface/Views/TimelineOverview.css:
+ (.timeline-overview.frames > .timeline-ruler > .header > .divider):
+ (.timeline-overview.frames > .timeline-ruler > .selection-handle.right):
+ (.timeline-overview.frames > .timeline-ruler > .shaded-area.right):
+ Shift ruler elements 1 pixel to the right, so that selection boundaries and dividers are
+ positioned inside the gap between frame elements.
+
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview):
+ (WebInspector.TimelineOverview.prototype.set secondsPerPixel):
+ (WebInspector.TimelineOverview.prototype.get pixelAlignDuration):
+ (WebInspector.TimelineOverview.prototype.set pixelAlignDuration):
+ (WebInspector.TimelineOverview.prototype._handleWheelEvent):
+ Added a property to force the overview graph to align duration units on the y-axis to pixel boundaries.
+ When enabled, frame elements are displayed in integer widths while zooming, preventing subpixel blurring
+ and maintaining a consistent 1 pixel gap between frames.
+
</ins><span class="cx"> 2015-07-07 Devin Rousso <drousso@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Tabbing in the styles sidebar doesn't highlight the next section of text
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js (186470 => 186471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js 2015-07-07 19:24:06 UTC (rev 186470)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js 2015-07-07 19:58:03 UTC (rev 186471)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineOverview.call(this, "frames", timelineRecording, minimumDurationPerPixel, maximumDurationPerPixel, defaultSettingsValues);
</span><span class="cx">
</span><ins>+ this.pixelAlignDuration = true;
</ins><span class="cx"> this.timelineRuler.snapInterval = 1;
</span><span class="cx"> this.timelineRuler.formatLabelCallback = function(value) {
</span><span class="cx"> return value.toFixed(0);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.css (186470 => 186471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.css 2015-07-07 19:24:06 UTC (rev 186470)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.css 2015-07-07 19:58:03 UTC (rev 186471)
</span><span class="lines">@@ -53,6 +53,19 @@
</span><span class="cx"> right: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.timeline-overview.frames > .timeline-ruler > .header > .divider {
+ -webkit-transform: translateX(0px);
+}
+
+.timeline-overview.frames > .timeline-ruler > .selection-handle.right {
+ -webkit-transform: translateX(5px);
+}
+
+.timeline-overview.frames > .timeline-ruler > .markers,
+.timeline-overview.frames > .timeline-ruler > .shaded-area.right {
+ -webkit-transform: translateX(1px);
+}
+
</ins><span class="cx"> .timeline-overview > .graphs-container {
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 29px;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (186470 => 186471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-07-07 19:24:06 UTC (rev 186470)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-07-07 19:58:03 UTC (rev 186471)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> this._recording.addEventListener(WebInspector.TimelineRecording.Event.TimelineRemoved, this._timelineRemoved, this);
</span><span class="cx">
</span><span class="cx"> this._element = document.createElement("div");
</span><del>- this._element.className = "timeline-overview";
</del><ins>+ this._element.classList.add("timeline-overview", identifier);
</ins><span class="cx"> this._element.addEventListener("wheel", this._handleWheelEvent.bind(this));
</span><span class="cx">
</span><span class="cx"> this._graphsContainerElement = document.createElement("div");
</span><span class="lines">@@ -72,6 +72,8 @@
</span><span class="cx"> this._minimumDurationPerPixel = minimumDurationPerPixel;
</span><span class="cx"> this._maximumDurationPerPixel = maximumDurationPerPixel;
</span><span class="cx"> this._durationPerPixel = Math.min(this._maximumDurationPerPixel, Math.max(this._minimumDurationPerPixel, this._durationPerPixelSetting.value));
</span><ins>+ this._pixelAlignDuration = false;
+ this._mouseWheelDelta = 0;
</ins><span class="cx"> this._scrollStartTime = 0;
</span><span class="cx"> this._cachedScrollContainerWidth = NaN;
</span><span class="cx">
</span><span class="lines">@@ -145,12 +147,34 @@
</span><span class="cx"> if (this._durationPerPixel === x)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (this._pixelAlignDuration) {
+ x = 1 / Math.round(1 / x);
+ if (this._durationPerPixel === x)
+ return;
+ }
+
</ins><span class="cx"> this._durationPerPixel = x;
</span><span class="cx"> this._durationPerPixelSetting.value = x;
</span><span class="cx">
</span><span class="cx"> this._needsLayout();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ get pixelAlignDuration()
+ {
+ return this._pixelAlignDuration;
+ },
+
+ set pixelAlignDuration(x)
+ {
+ if (this._pixelAlignDuration === x)
+ return;
+
+ this._mouseWheelDelta = 0;
+ this._pixelAlignDuration = x;
+ if (this._pixelAlignDuration)
+ this.secondsPerPixel = 1 / Math.round(1 / this._durationPerPixel);
+ },
+
</ins><span class="cx"> get endTime()
</span><span class="cx"> {
</span><span class="cx"> return this._endTime;
</span><span class="lines">@@ -246,6 +270,8 @@
</span><span class="cx"> for (var timelineOverviewGraph of this._timelineOverviewGraphsMap.values())
</span><span class="cx"> timelineOverviewGraph.reset();
</span><span class="cx">
</span><ins>+ this._mouseWheelDelta = 0;
+
</ins><span class="cx"> this._resetSelection();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -397,9 +423,21 @@
</span><span class="cx"> var mouseOffset = event.pageX - this._element.totalOffsetLeft;
</span><span class="cx"> var mousePositionTime = this._scrollStartTime + (mouseOffset * this._durationPerPixel);
</span><span class="cx"> var deviceDirection = event.webkitDirectionInvertedFromDevice ? 1 : -1;
</span><ins>+ var delta = event.deltaY * (this._durationPerPixel / WebInspector.TimelineOverview.ScrollDeltaDenominator) * deviceDirection;
</ins><span class="cx">
</span><del>- this.secondsPerPixel += event.deltaY * (this._durationPerPixel / WebInspector.TimelineOverview.ScrollDeltaDenominator) * deviceDirection;
</del><ins>+ // Reset accumulated wheel delta when direction changes.
+ if (this._pixelAlignDuration && (delta < 0 && this._mouseWheelDelta >= 0 || delta >= 0 && this._mouseWheelDelta < 0))
+ this._mouseWheelDelta = 0;
</ins><span class="cx">
</span><ins>+ var previousDurationPerPixel = this._durationPerPixel;
+ this._mouseWheelDelta += delta;
+ this.secondsPerPixel += this._mouseWheelDelta;
+
+ if (this._durationPerPixel === this._minimumDurationPerPixel && delta < 0 || this._durationPerPixel === this._maximumDurationPerPixel && delta >= 0)
+ this._mouseWheelDelta = 0;
+ else
+ this._mouseWheelDelta = previousDurationPerPixel + this._mouseWheelDelta - this._durationPerPixel;
+
</ins><span class="cx"> // Center the zoom around the mouse based on the remembered mouse position time.
</span><span class="cx"> this.scrollStartTime = mousePositionTime - (mouseOffset * this._durationPerPixel);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>