<!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>[188360] 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/188360">188360</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2015-08-12 14:39:49 -0700 (Wed, 12 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove clamp and adopt Number.constrain
https://bugs.webkit.org/show_bug.cgi?id=147952
Reviewed by Timothy Hatcher.
* UserInterface/Base/Utilities.js:
Removed clamp function.
* UserInterface/Views/BezierEditor.js:
(WebInspector.BezierEditor.prototype._updateControlPointsForMouseEvent):
* UserInterface/Views/ProfileNodeDataGridNode.js:
(WebInspector.ProfileNodeDataGridNode.prototype.updateRangeTimes):
* UserInterface/Views/ScriptTimelineDataGridNode.js:
(WebInspector.ScriptTimelineDataGridNode.prototype.updateRangeTimes):
* UserInterface/Views/TimelineRuler.js:
(WebInspector.TimelineRuler.prototype._updateSelection):
Replaced instances of clamp with Number.constrain.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsBezierEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/BezierEditor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsProfileNodeDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScriptTimelineDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (188359 => 188360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-08-12 21:10:25 UTC (rev 188359)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-08-12 21:39:49 UTC (rev 188360)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-08-12 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Remove clamp and adopt Number.constrain
+ https://bugs.webkit.org/show_bug.cgi?id=147952
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Utilities.js:
+ Removed clamp function.
+
+ * UserInterface/Views/BezierEditor.js:
+ (WebInspector.BezierEditor.prototype._updateControlPointsForMouseEvent):
+ * UserInterface/Views/ProfileNodeDataGridNode.js:
+ (WebInspector.ProfileNodeDataGridNode.prototype.updateRangeTimes):
+ * UserInterface/Views/ScriptTimelineDataGridNode.js:
+ (WebInspector.ScriptTimelineDataGridNode.prototype.updateRangeTimes):
+ * UserInterface/Views/TimelineRuler.js:
+ (WebInspector.TimelineRuler.prototype._updateSelection):
+ Replaced instances of clamp with Number.constrain.
+
</ins><span class="cx"> 2015-08-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: DOM Node should have context menu to scroll it into view on the inspected page
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (188359 => 188360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2015-08-12 21:10:25 UTC (rev 188359)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2015-08-12 21:39:49 UTC (rev 188360)
</span><span class="lines">@@ -1079,11 +1079,6 @@
</span><span class="cx"> return "\"" + str.replace(/"/g, "\\\"") + "\"";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function clamp(min, value, max)
-{
- return Math.min(Math.max(min, value), max);
-}
-
</del><span class="cx"> function insertionIndexForObjectInListSortedByFunction(object, list, comparator, insertionIndexAfter)
</span><span class="cx"> {
</span><span class="cx"> if (insertionIndexAfter) {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsBezierEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/BezierEditor.js (188359 => 188360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/BezierEditor.js 2015-08-12 21:10:25 UTC (rev 188359)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/BezierEditor.js 2015-08-12 21:39:49 UTC (rev 188360)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> _updateControlPointsForMouseEvent(event, calculateSelectedControlPoint)
</span><span class="cx"> {
</span><span class="cx"> var point = WebInspector.Point.fromEventInElement(event, this._bezierContainer);
</span><del>- point.x = clamp(0, point.x - this._controlHandleRadius, this._bezierWidth);
</del><ins>+ point.x = Number.constrain(point.x - this._controlHandleRadius, 0, this._bezierWidth);
</ins><span class="cx"> point.y -= this._controlHandleRadius + this._padding;
</span><span class="cx">
</span><span class="cx"> if (calculateSelectedControlPoint) {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsProfileNodeDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js (188359 => 188360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js 2015-08-12 21:10:25 UTC (rev 188359)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js 2015-08-12 21:39:49 UTC (rev 188360)
</span><span class="lines">@@ -86,10 +86,10 @@
</span><span class="cx"> // We only need a refresh if the new range time changes the visible portion of this record.
</span><span class="cx"> var profileStart = this._profileNode.startTime;
</span><span class="cx"> var profileEnd = this._profileNode.endTime;
</span><del>- var oldStartBoundary = clamp(profileStart, oldRangeStartTime, profileEnd);
- var oldEndBoundary = clamp(profileStart, oldRangeEndTime, profileEnd);
- var newStartBoundary = clamp(profileStart, startTime, profileEnd);
- var newEndBoundary = clamp(profileStart, endTime, profileEnd);
</del><ins>+ var oldStartBoundary = Number.constrain(oldRangeStartTime, profileStart, profileEnd);
+ var oldEndBoundary = Number.constrain(oldRangeEndTime, profileStart, profileEnd);
+ var newStartBoundary = Number.constrain(startTime, profileStart, profileEnd);
+ var newEndBoundary = Number.constrain(endTime, profileStart, profileEnd);
</ins><span class="cx">
</span><span class="cx"> if (oldStartBoundary !== newStartBoundary || oldEndBoundary !== newEndBoundary)
</span><span class="cx"> this.needsRefresh();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScriptTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js (188359 => 188360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2015-08-12 21:10:25 UTC (rev 188359)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2015-08-12 21:39:49 UTC (rev 188360)
</span><span class="lines">@@ -99,10 +99,10 @@
</span><span class="cx"> // We only need a refresh if the new range time changes the visible portion of this record.
</span><span class="cx"> var recordStart = this._record.startTime;
</span><span class="cx"> var recordEnd = this._record.startTime + this._record.duration;
</span><del>- var oldStartBoundary = clamp(recordStart, oldRangeStartTime, recordEnd);
- var oldEndBoundary = clamp(recordStart, oldRangeEndTime, recordEnd);
- var newStartBoundary = clamp(recordStart, startTime, recordEnd);
- var newEndBoundary = clamp(recordStart, endTime, recordEnd);
</del><ins>+ var oldStartBoundary = Number.constrain(oldRangeStartTime, recordStart, recordEnd);
+ var oldEndBoundary = Number.constrain(oldRangeEndTime, recordStart, recordEnd);
+ var newStartBoundary = Number.constrain(startTime, recordStart, recordEnd);
+ var newEndBoundary = Number.constrain(endTime, recordStart, recordEnd);
</ins><span class="cx">
</span><span class="cx"> if (oldStartBoundary !== newStartBoundary || oldEndBoundary !== newEndBoundary)
</span><span class="cx"> this.needsRefresh();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (188359 => 188360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-08-12 21:10:25 UTC (rev 188359)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-08-12 21:39:49 UTC (rev 188360)
</span><span class="lines">@@ -595,7 +595,7 @@
</span><span class="cx"> let formattedStartTimeText = this._formatDividerLabelText(this._selectionStartTime);
</span><span class="cx"> let formattedEndTimeText = this._formatDividerLabelText(this._selectionEndTime);
</span><span class="cx">
</span><del>- let newLeftPosition = clamp(0, (this._selectionStartTime - this._startTime) / duration, 1);
</del><ins>+ let newLeftPosition = Number.constrain((this._selectionStartTime - this._startTime) / duration, 0, 1);
</ins><span class="cx"> this._updatePositionOfElement(this._leftShadedAreaElement, newLeftPosition, visibleWidth, "width");
</span><span class="cx"> this._updatePositionOfElement(this._leftSelectionHandleElement, newLeftPosition, visibleWidth, "left");
</span><span class="cx"> this._updatePositionOfElement(this._selectionDragElement, newLeftPosition, visibleWidth, "left");
</span><span class="lines">@@ -604,7 +604,7 @@
</span><span class="cx"> this._leftSelectionHandleElement.classList.toggle("hidden", startTimeClamped && endTimeClamped && this._selectionStartTime < this._startTime);
</span><span class="cx"> this._leftSelectionHandleElement.title = formattedStartTimeText;
</span><span class="cx">
</span><del>- let newRightPosition = 1 - clamp(0, (this._selectionEndTime - this._startTime) / duration, 1);
</del><ins>+ let newRightPosition = 1 - Number.constrain((this._selectionEndTime - this._startTime) / duration, 0, 1);
</ins><span class="cx"> this._updatePositionOfElement(this._rightShadedAreaElement, newRightPosition, visibleWidth, "width");
</span><span class="cx"> this._updatePositionOfElement(this._rightSelectionHandleElement, newRightPosition, visibleWidth, "right");
</span><span class="cx"> this._updatePositionOfElement(this._selectionDragElement, newRightPosition, visibleWidth, "right");
</span></span></pre>
</div>
</div>
</body>
</html>