<!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>[185734] 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/185734">185734</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2015-06-18 21:45:34 -0700 (Thu, 18 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Rendering Frames timeline selection should snap to frame boundaries
https://bugs.webkit.org/show_bug.cgi?id=146120
Reviewed by Timothy Hatcher.
* UserInterface/Views/RenderingFrameTimelineOverview.js:
Enable snapping to frame boundaries.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView.prototype._updateFrameSelection):
Updated filtering to account for ruler snapping.
* UserInterface/Views/TimelineRuler.js:
(WebInspector.TimelineRuler.prototype.get snapInterval):
(WebInspector.TimelineRuler.prototype.set snapInterval):
(WebInspector.TimelineRuler.prototype.set selectionStartTime):
(WebInspector.TimelineRuler.prototype.set selectionEndTime):
(WebInspector.TimelineRuler.prototype._snapValue):
(WebInspector.TimelineRuler.prototype._handleMouseMove):
Added support for snapping to a specified interval.
* UserInterface/Views/TimelineSidebarPanel.js:
Removed unnecessary code.</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="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (185733 => 185734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-06-19 03:46:06 UTC (rev 185733)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-06-19 04:45:34 UTC (rev 185734)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-06-18 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Rendering Frames timeline selection should snap to frame boundaries
+ https://bugs.webkit.org/show_bug.cgi?id=146120
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/RenderingFrameTimelineOverview.js:
+ Enable snapping to frame boundaries.
+
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype._updateFrameSelection):
+ Updated filtering to account for ruler snapping.
+
+ * UserInterface/Views/TimelineRuler.js:
+ (WebInspector.TimelineRuler.prototype.get snapInterval):
+ (WebInspector.TimelineRuler.prototype.set snapInterval):
+ (WebInspector.TimelineRuler.prototype.set selectionStartTime):
+ (WebInspector.TimelineRuler.prototype.set selectionEndTime):
+ (WebInspector.TimelineRuler.prototype._snapValue):
+ (WebInspector.TimelineRuler.prototype._handleMouseMove):
+ Added support for snapping to a specified interval.
+
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ Removed unnecessary code.
+
</ins><span class="cx"> 2015-06-18 Devin Rousso <drousso@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add a filter for CSS properties in the Styles sidebar
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js (185733 => 185734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js 2015-06-19 03:46:06 UTC (rev 185733)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js 2015-06-19 04:45:34 UTC (rev 185734)
</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.timelineRuler.snapInterval = 1;
</ins><span class="cx"> this.timelineRuler.formatLabelCallback = function(value) {
</span><span class="cx"> return value.toFixed(0);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (185733 => 185734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-06-19 03:46:06 UTC (rev 185733)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-06-19 04:45:34 UTC (rev 185734)
</span><span class="lines">@@ -265,11 +265,12 @@
</span><span class="cx">
</span><span class="cx"> if (this._renderingFrameTimeline && this._renderingFrameTimeline.records.length) {
</span><span class="cx"> var records = this._renderingFrameTimeline.records;
</span><del>- var startIndex = Math.floor(startTime);
</del><ins>+ var startIndex = this._currentTimelineOverview.timelineRuler.snapInterval ? startTime : Math.floor(startTime);
</ins><span class="cx"> if (startIndex >= records.length)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- var endIndex = Math.min(Math.floor(endTime), records.length - 1);
</del><ins>+ var endIndex = this._currentTimelineOverview.timelineRuler.snapInterval ? endTime - 1: Math.floor(endTime);
+ endIndex = Math.min(endIndex, records.length - 1);
</ins><span class="cx"> console.assert(startIndex <= endIndex, startIndex);
</span><span class="cx">
</span><span class="cx"> startTime = records[startIndex].startTime;
</span><span class="lines">@@ -671,7 +672,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var startIndex = this._renderingFrameTimelineOverview.selectionStartTime;
</span><del>- var endIndex = startIndex + this._renderingFrameTimelineOverview.selectionDuration;
</del><ins>+ var endIndex = startIndex + this._renderingFrameTimelineOverview.selectionDuration - 1;
</ins><span class="cx"> this._timelineSidebarPanel.updateFrameSelection(startIndex, endIndex);
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (185733 => 185734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-06-19 03:46:06 UTC (rev 185733)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-06-19 04:45:34 UTC (rev 185734)
</span><span class="lines">@@ -253,6 +253,19 @@
</span><span class="cx"> this._needsLayout();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ get snapInterval()
+ {
+ return this._snapInterval;
+ },
+
+ set snapInterval(x)
+ {
+ if (this._snapInterval === x)
+ return;
+
+ this._snapInterval = x;
+ },
+
</ins><span class="cx"> get selectionStartTime()
</span><span class="cx"> {
</span><span class="cx"> return this._selectionStartTime;
</span><span class="lines">@@ -260,6 +273,7 @@
</span><span class="cx">
</span><span class="cx"> set selectionStartTime(x)
</span><span class="cx"> {
</span><ins>+ x = this._snapValue(x);
</ins><span class="cx"> if (this._selectionStartTime === x)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -276,6 +290,7 @@
</span><span class="cx">
</span><span class="cx"> set selectionEndTime(x)
</span><span class="cx"> {
</span><ins>+ x = this._snapValue(x);
</ins><span class="cx"> if (this._selectionEndTime === x)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -604,6 +619,14 @@
</span><span class="cx"> return Number.secondsToString(value, true);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _snapValue: function(value)
+ {
+ if (!value || !this.snapInterval)
+ return value;
+
+ return Math.round(value / this.snapInterval) * this.snapInterval;
+ },
+
</ins><span class="cx"> _dispatchTimeRangeSelectionChangedEvent: function()
</span><span class="cx"> {
</span><span class="cx"> delete this._timeRangeSelectionChanged;
</span><span class="lines">@@ -657,10 +680,23 @@
</span><span class="cx">
</span><span class="cx"> var offsetTime = (currentMousePosition - this._lastMousePosition) * this.secondsPerPixel;
</span><span class="cx"> var selectionDuration = this.selectionEndTime - this.selectionStartTime;
</span><ins>+ var oldSelectionStartTime = this.selectionStartTime;
</ins><span class="cx">
</span><span class="cx"> this.selectionStartTime = Math.max(this.startTime, Math.min(this.selectionStartTime + offsetTime, this.endTime - selectionDuration));
</span><span class="cx"> this.selectionEndTime = this.selectionStartTime + selectionDuration;
</span><span class="cx">
</span><ins>+ if (this.snapInterval) {
+ // When snapping we need to check the mouse position delta relative to the last snap, rather than the
+ // last mouse move. If a snap occurs we adjust for the amount the cursor drifted, so that the mouse
+ // position relative to the selection remains constant.
+ var snapOffset = this.selectionStartTime - oldSelectionStartTime;
+ if (!snapOffset)
+ return;
+
+ var positionDrift = (offsetTime - snapOffset * this.snapInterval) / this.secondsPerPixel;
+ currentMousePosition -= positionDrift;
+ }
+
</ins><span class="cx"> this._lastMousePosition = currentMousePosition;
</span><span class="cx"> } else {
</span><span class="cx"> var currentMousePosition = event.pageX - this._rulerBoundingClientRect.left;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (185733 => 185734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-06-19 03:46:06 UTC (rev 185733)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-06-19 04:45:34 UTC (rev 185734)
</span><span class="lines">@@ -317,9 +317,6 @@
</span><span class="cx"> {
</span><span class="cx"> console.assert(startFrameIndex <= endFrameIndex);
</span><span class="cx"> console.assert(this.viewMode === WebInspector.TimelineSidebarPanel.ViewMode.RenderingFrames, this._viewMode);
</span><del>-
- startFrameIndex = Math.floor(startFrameIndex);
- endFrameIndex = Math.floor(endFrameIndex);
</del><span class="cx"> if (this._startFrameIndex === startFrameIndex && this._endFrameIndex === endFrameIndex)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>