<!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>[193009] branches/safari-601-branch/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/193009">193009</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:30:23 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186824">r186824</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineOverviewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193008 => 193009)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:30:17 UTC (rev 193008)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:30:23 UTC (rev 193009)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-12-01 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186824. rdar://problem/23221163
+
+ 2015-07-14 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: TimelineRuler minimum selection time range should be configurable
+ https://bugs.webkit.org/show_bug.cgi?id=146944
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/RenderingFrameTimelineOverview.js:
+ Set minimum selection to 1 frame.
+
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview.prototype.set selectionDuration):
+ Use ruler's minimum duration.
+
+ * UserInterface/Views/TimelineRuler.js:
+ (WebInspector.TimelineRuler):
+ (WebInspector.TimelineRuler.prototype.get minimumSelectionDuration):
+ (WebInspector.TimelineRuler.prototype.set minimumSelectionDuration):
+ (WebInspector.TimelineRuler.prototype._handleMouseUp):
+ (WebInspector.TimelineRuler.prototype._handleSelectionHandleMouseMove):
+ Added property for setting minimum selection duration. Default minimum duration is 0.01, which is
+ equal to the old hard-coded minimum selection time range.
+
+2015-12-01 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r186796. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-07-13 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js (193008 => 193009)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js 2015-12-03 18:30:17 UTC (rev 193008)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js 2015-12-03 18:30:23 UTC (rev 193009)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> WebInspector.TimelineOverview.call(this, "frames", timelineRecording, minimumDurationPerPixel, maximumDurationPerPixel, defaultSettingsValues);
</span><span class="cx">
</span><span class="cx"> this.pixelAlignDuration = true;
</span><ins>+ this.timelineRuler.minimumSelectionDuration = 1;
</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="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (193008 => 193009)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-12-03 18:30:17 UTC (rev 193008)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-12-03 18:30:23 UTC (rev 193009)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx">
</span><span class="cx"> set selectionDuration(x)
</span><span class="cx"> {
</span><del>- x = Math.max(WebInspector.TimelineRuler.MinimumSelectionTimeRange, x);
</del><ins>+ x = Math.max(this._timelineRuler.minimumSelectionDuration, x);
</ins><span class="cx">
</span><span class="cx"> this._timelineRuler.selectionEndTime = this._timelineRuler.selectionStartTime + x;
</span><span class="cx"> },
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (193008 => 193009)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-12-03 18:30:17 UTC (rev 193008)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-12-03 18:30:23 UTC (rev 193009)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> this._endTimePinned = false;
</span><span class="cx"> this._allowsClippedLabels = false;
</span><span class="cx"> this._allowsTimeRangeSelection = false;
</span><ins>+ this._minimumSelectionDuration = 0.01;
</ins><span class="cx"> this._formatLabelCallback = null;
</span><span class="cx">
</span><span class="cx"> this._markerElementMap = new Map;
</span><span class="lines">@@ -61,8 +62,6 @@
</span><span class="cx"> WebInspector.TimelineRuler.DividerElementStyleClassName = "divider";
</span><span class="cx"> WebInspector.TimelineRuler.DividerLabelElementStyleClassName = "label";
</span><span class="cx">
</span><del>-WebInspector.TimelineRuler.MinimumSelectionTimeRange = 0.01;
-
</del><span class="cx"> WebInspector.TimelineRuler.Event = {
</span><span class="cx"> TimeRangeSelectionChanged: "time-ruler-time-range-selection-changed"
</span><span class="cx"> };
</span><span class="lines">@@ -160,6 +159,16 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ get minimumSelectionDuration()
+ {
+ return this._minimumSelectionDuration;
+ },
+
+ set minimumSelectionDuration(x)
+ {
+ this._minimumSelectionDuration = x;
+ },
+
</ins><span class="cx"> get zeroTime()
</span><span class="cx"> {
</span><span class="cx"> return this._zeroTime;
</span><span class="lines">@@ -715,15 +724,15 @@
</span><span class="cx"> {
</span><span class="cx"> console.assert(event.button === 0);
</span><span class="cx">
</span><del>- if (!this._selectionIsMove && this.selectionEndTime - this.selectionStartTime < WebInspector.TimelineRuler.MinimumSelectionTimeRange) {
</del><ins>+ if (!this._selectionIsMove && this.selectionEndTime - this.selectionStartTime < this.minimumSelectionDuration) {
</ins><span class="cx"> // The section is smaller than allowed, grow in the direction of the drag to meet the minumum.
</span><span class="cx"> var currentMousePosition = event.pageX - this._rulerBoundingClientRect.left;
</span><span class="cx"> if (currentMousePosition > this._mouseDownPosition) {
</span><del>- this.selectionEndTime = Math.min(this.selectionStartTime + WebInspector.TimelineRuler.MinimumSelectionTimeRange, this.endTime);
- this.selectionStartTime = this.selectionEndTime - WebInspector.TimelineRuler.MinimumSelectionTimeRange;
</del><ins>+ this.selectionEndTime = Math.min(this.selectionStartTime + this.minimumSelectionDuration, this.endTime);
+ this.selectionStartTime = this.selectionEndTime - this.minimumSelectionDuration;
</ins><span class="cx"> } else {
</span><del>- this.selectionStartTime = Math.max(this.startTime, this.selectionEndTime - WebInspector.TimelineRuler.MinimumSelectionTimeRange);
- this.selectionEndTime = this.selectionStartTime + WebInspector.TimelineRuler.MinimumSelectionTimeRange;
</del><ins>+ this.selectionStartTime = Math.max(this.startTime, this.selectionEndTime - this.minimumSelectionDuration);
+ this.selectionEndTime = this.selectionStartTime + this.minimumSelectionDuration;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -778,19 +787,19 @@
</span><span class="cx"> // Resize the selection on both sides when the Option keys is held down.
</span><span class="cx"> if (this._dragHandleIsStartTime) {
</span><span class="cx"> var timeDifference = currentTime - this.selectionStartTime;
</span><del>- this.selectionStartTime = Math.max(this.startTime, Math.min(currentTime, this.selectionEndTime - WebInspector.TimelineRuler.MinimumSelectionTimeRange));
- this.selectionEndTime = Math.min(Math.max(this.selectionStartTime + WebInspector.TimelineRuler.MinimumSelectionTimeRange, this.selectionEndTime - timeDifference), this.endTime);
</del><ins>+ this.selectionStartTime = Math.max(this.startTime, Math.min(currentTime, this.selectionEndTime - this.minimumSelectionDuration));
+ this.selectionEndTime = Math.min(Math.max(this.selectionStartTime + this.minimumSelectionDuration, this.selectionEndTime - timeDifference), this.endTime);
</ins><span class="cx"> } else {
</span><span class="cx"> var timeDifference = currentTime - this.selectionEndTime;
</span><del>- this.selectionEndTime = Math.min(Math.max(this.selectionStartTime + WebInspector.TimelineRuler.MinimumSelectionTimeRange, currentTime), this.endTime);
- this.selectionStartTime = Math.max(this.startTime, Math.min(this.selectionStartTime - timeDifference, this.selectionEndTime - WebInspector.TimelineRuler.MinimumSelectionTimeRange));
</del><ins>+ this.selectionEndTime = Math.min(Math.max(this.selectionStartTime + this.minimumSelectionDuration, currentTime), this.endTime);
+ this.selectionStartTime = Math.max(this.startTime, Math.min(this.selectionStartTime - timeDifference, this.selectionEndTime - this.minimumSelectionDuration));
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // Resize the selection on side being dragged.
</span><span class="cx"> if (this._dragHandleIsStartTime)
</span><del>- this.selectionStartTime = Math.max(this.startTime, Math.min(currentTime, this.selectionEndTime - WebInspector.TimelineRuler.MinimumSelectionTimeRange));
</del><ins>+ this.selectionStartTime = Math.max(this.startTime, Math.min(currentTime, this.selectionEndTime - this.minimumSelectionDuration));
</ins><span class="cx"> else
</span><del>- this.selectionEndTime = Math.min(Math.max(this.selectionStartTime + WebInspector.TimelineRuler.MinimumSelectionTimeRange, currentTime), this.endTime);
</del><ins>+ this.selectionEndTime = Math.min(Math.max(this.selectionStartTime + this.minimumSelectionDuration, currentTime), this.endTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._updateSelection(this._element.clientWidth, this.duration);
</span></span></pre>
</div>
</div>
</body>
</html>