<!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>[172782] branches/safari-600.1-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/172782">172782</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-19 16:35:53 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/172689">r172689</a>. <rdar://problem/18040028></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebInspectorUIChangeLog">branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceBaseUtilitiesjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Utilities.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceModelsProfileNodejs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Models/ProfileNode.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsProfileNodeDataGridNodejs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsScriptTimelineDataGridNodejs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsScriptTimelineViewjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172781 => 172782)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 23:33:42 UTC (rev 172781)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 23:35:53 UTC (rev 172782)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2014-08-19 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172689. <rdar://problem/18040028>
+
+ 2014-08-16 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Improve performance of selection range changes viewing Scripts timeline
+ https://bugs.webkit.org/show_bug.cgi?id=136015
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Utilities.js:
+ (clamp):
+ Helper function to clamp a value between a min and max.
+
+ * UserInterface/Models/ProfileNode.js:
+ (WebInspector.ProfileNode.prototype.get startTime):
+ (WebInspector.ProfileNode.prototype.get endTime):
+ These can be quickly calculated, so avoid full calculation to grab the values.
+
+ * UserInterface/Views/ScriptTimelineView.js:
+ (WebInspector.ScriptTimelineView.prototype.updateLayout):
+ Update ranges with a smart helper, instead of blindly doing it and needing refresh.
+
+ * UserInterface/Views/ProfileNodeDataGridNode.js:
+ (WebInspector.ProfileNodeDataGridNode.prototype.get rangeEndTime):
+ (WebInspector.ProfileNodeDataGridNode.prototype.get data):
+ (WebInspector.ProfileNodeDataGridNode.prototype.updateRangeTimes):
+ (WebInspector.ProfileNodeDataGridNode.prototype.set rangeStartTime): Deleted.
+ (WebInspector.ProfileNodeDataGridNode.prototype.set rangeEndTime): Deleted.
+ * UserInterface/Views/ScriptTimelineDataGridNode.js:
+ (WebInspector.ScriptTimelineDataGridNode.prototype.updateRangeTimes):
+ (WebInspector.ScriptTimelineDataGridNode.prototype.set rangeStartTime): Deleted.
+ (WebInspector.ScriptTimelineDataGridNode.prototype.set rangeEndTime): Deleted.
+ When updating the range selection, compare to the last range selection
+ on this DataGridNode. If the visible portion of this node's time range
+ changes, we need a refresh. Otherwise, we don't need a refresh.
+
+2014-08-19 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172682. <rdar://problem/18038767>
</span><span class="cx">
</span><span class="cx"> 2014-08-15 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Utilities.js (172781 => 172782)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2014-08-19 23:33:42 UTC (rev 172781)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2014-08-19 23:35:53 UTC (rev 172782)
</span><span class="lines">@@ -1015,6 +1015,11 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+function clamp(min, value, max)
+{
+ return Math.min(Math.max(min, value), max);
+}
+
</ins><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="branchessafari6001branchSourceWebInspectorUIUserInterfaceModelsProfileNodejs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Models/ProfileNode.js (172781 => 172782)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Models/ProfileNode.js 2014-08-19 23:33:42 UTC (rev 172781)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Models/ProfileNode.js 2014-08-19 23:35:53 UTC (rev 172782)
</span><span class="lines">@@ -94,13 +94,15 @@
</span><span class="cx">
</span><span class="cx"> get startTime()
</span><span class="cx"> {
</span><del>- this._computeTotalTimesIfNeeded();
</del><ins>+ if (this._startTime === undefined)
+ this._startTime = Math.max(0, this._calls[0].startTime);
</ins><span class="cx"> return this._startTime;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> get endTime()
</span><span class="cx"> {
</span><del>- this._computeTotalTimesIfNeeded();
</del><ins>+ if (this._endTime === undefined)
+ this._endTime = Math.min(this._calls.lastValue.endTime, Infinity);
</ins><span class="cx"> return this._endTime;
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsProfileNodeDataGridNodejs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js (172781 => 172782)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js 2014-08-19 23:33:42 UTC (rev 172781)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js 2014-08-19 23:35:53 UTC (rev 172782)
</span><span class="lines">@@ -68,32 +68,37 @@
</span><span class="cx"> return this._rangeStartTime;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- set rangeStartTime(x)
</del><ins>+ get rangeEndTime()
</ins><span class="cx"> {
</span><del>- if (this._rangeStartTime === x)
- return;
-
- this._rangeStartTime = x;
- this.needsRefresh();
</del><ins>+ return this._rangeEndTime;
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- get rangeEndTime()
</del><ins>+ get data()
</ins><span class="cx"> {
</span><del>- return this._rangeEndTime;
</del><ins>+ return this._data;
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- set rangeEndTime(x)
</del><ins>+ updateRangeTimes: function(startTime, endTime)
</ins><span class="cx"> {
</span><del>- if (this._rangeEndTime === x)
</del><ins>+ var oldRangeStartTime = this._rangeStartTime;
+ var oldRangeEndTime = this._rangeEndTime;
+
+ if (oldRangeStartTime === startTime && oldRangeEndTime === endTime)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- this._rangeEndTime = x;
- this.needsRefresh();
- },
</del><ins>+ this._rangeStartTime = startTime;
+ this._rangeEndTime = endTime;
</ins><span class="cx">
</span><del>- get data()
- {
- return this._data;
</del><ins>+ // We only need a refresh if the new range time changes the visible portion of this record.
+ var profileStart = this._profileNode.startTime;
+ var profileEnd = this._profileNode.endTime;
+ var oldStartBoundary = clamp(profileStart, oldRangeStartTime, profileEnd);
+ var oldEndBoundary = clamp(profileStart, oldRangeEndTime, profileEnd);
+ var newStartBoundary = clamp(profileStart, startTime, profileEnd);
+ var newEndBoundary = clamp(profileStart, endTime, profileEnd);
+
+ if (oldStartBoundary !== newStartBoundary || oldEndBoundary !== newEndBoundary)
+ this.needsRefresh();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> refresh: function()
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsScriptTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js (172781 => 172782)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2014-08-19 23:33:42 UTC (rev 172781)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2014-08-19 23:35:53 UTC (rev 172782)
</span><span class="lines">@@ -63,29 +63,11 @@
</span><span class="cx"> return this._rangeStartTime;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- set rangeStartTime(x)
- {
- if (this._rangeStartTime === x)
- return;
-
- this._rangeStartTime = x;
- this.needsRefresh();
- },
-
</del><span class="cx"> get rangeEndTime()
</span><span class="cx"> {
</span><span class="cx"> return this._rangeEndTime;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- set rangeEndTime(x)
- {
- if (this._rangeEndTime === x)
- return;
-
- this._rangeEndTime = x;
- this.needsRefresh();
- },
-
</del><span class="cx"> get data()
</span><span class="cx"> {
</span><span class="cx"> var startTime = Math.max(this._rangeStartTime, this._record.startTime);
</span><span class="lines">@@ -96,6 +78,33 @@
</span><span class="cx"> averageTime: duration, callCount: 1, location: callFrameOrSourceCodeLocation};
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ updateRangeTimes: function(startTime, endTime)
+ {
+ var oldRangeStartTime = this._rangeStartTime;
+ var oldRangeEndTime = this._rangeEndTime;
+
+ if (oldRangeStartTime === startTime && oldRangeEndTime === endTime)
+ return;
+
+ this._rangeStartTime = startTime;
+ this._rangeEndTime = endTime;
+
+ // If we have no duration the range does not matter.
+ if (!this._record.duration)
+ return;
+
+ // We only need a refresh if the new range time changes the visible portion of this record.
+ var recordStart = this._record.startTime;
+ var recordEnd = this._record.startTime + this._record.duration;
+ var oldStartBoundary = clamp(recordStart, oldRangeStartTime, recordEnd);
+ var oldEndBoundary = clamp(recordStart, oldRangeEndTime, recordEnd);
+ var newStartBoundary = clamp(recordStart, startTime, recordEnd);
+ var newEndBoundary = clamp(recordStart, endTime, recordEnd);
+
+ if (oldStartBoundary !== newStartBoundary || oldEndBoundary !== newEndBoundary)
+ this.needsRefresh();
+ },
+
</ins><span class="cx"> createCellContent: function(columnIdentifier, cell)
</span><span class="cx"> {
</span><span class="cx"> const emptyValuePlaceholderString = "\u2014";
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsScriptTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js (172781 => 172782)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js 2014-08-19 23:33:42 UTC (rev 172781)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js 2014-08-19 23:35:53 UTC (rev 172782)
</span><span class="lines">@@ -111,8 +111,7 @@
</span><span class="cx"> if (this.startTime !== this._oldStartTime || this.endTime !== this._oldEndTime) {
</span><span class="cx"> var dataGridNode = this._dataGrid.children[0];
</span><span class="cx"> while (dataGridNode) {
</span><del>- dataGridNode.rangeStartTime = this.startTime;
- dataGridNode.rangeEndTime = this.endTime;
</del><ins>+ dataGridNode.updateRangeTimes(this.startTime, this.endTime);
</ins><span class="cx"> if (dataGridNode.revealed)
</span><span class="cx"> dataGridNode.refreshIfNeeded();
</span><span class="cx"> dataGridNode = dataGridNode.traverseNextNode(false, null, true);
</span></span></pre>
</div>
</div>
</body>
</html>