<!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>[200949] 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/200949">200949</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2016-05-16 11:04:25 -0700 (Mon, 16 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: DataGrid _updateVisibleRows dominates profiles of timeline recordings when data grid (Overview or TimelineDataGrids) is showing
https://bugs.webkit.org/show_bug.cgi?id=157664
rdar://problem/26262219
Reviewed by Joseph Pecoraro.
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid): Added new members.
(WebInspector.DataGrid.prototype.layout): Reset _cachedScrollTop and _cachedScrollHeight on resize.
(WebInspector.DataGrid.prototype._noteScrollPositionChanged): Added.
(WebInspector.DataGrid.prototype._updateVisibleRows): Cache sizes and positions when possible.
(WebInspector.DataGridNode.prototype.set hidden): Added call to _noteRowsChanged.
(WebInspector.DataGridNode.prototype.collapse): Call _noteRowsChanged instead of needsLayout.
(WebInspector.DataGridNode.prototype.expand): Call _noteRowsChanged instead of needsLayout.
(WebInspector.DataGrid.prototype._updateFilter): Removed direct call to _updateVisibleRows, this is
better handled by DataGridNode's hidden setter.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (200948 => 200949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-16 17:47:08 UTC (rev 200948)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-16 18:04:25 UTC (rev 200949)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-05-14 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: DataGrid _updateVisibleRows dominates profiles of timeline recordings when data grid (Overview or TimelineDataGrids) is showing
+ https://bugs.webkit.org/show_bug.cgi?id=157664
+ rdar://problem/26262219
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid): Added new members.
+ (WebInspector.DataGrid.prototype.layout): Reset _cachedScrollTop and _cachedScrollHeight on resize.
+ (WebInspector.DataGrid.prototype._noteScrollPositionChanged): Added.
+ (WebInspector.DataGrid.prototype._updateVisibleRows): Cache sizes and positions when possible.
+ (WebInspector.DataGridNode.prototype.set hidden): Added call to _noteRowsChanged.
+ (WebInspector.DataGridNode.prototype.collapse): Call _noteRowsChanged instead of needsLayout.
+ (WebInspector.DataGridNode.prototype.expand): Call _noteRowsChanged instead of needsLayout.
+ (WebInspector.DataGrid.prototype._updateFilter): Removed direct call to _updateVisibleRows, this is
+ better handled by DataGridNode's hidden setter.
+
+2016-05-14 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Web Inspector: Many DataGrid instances do not save/restore their scroll position
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157709
</span><span class="cx"> rdar://problem/26286090
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (200948 => 200949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-05-16 17:47:08 UTC (rev 200948)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-05-16 18:04:25 UTC (rev 200949)
</span><span class="lines">@@ -53,6 +53,12 @@
</span><span class="cx"> this.resizers = [];
</span><span class="cx"> this._columnWidthsInitialized = false;
</span><span class="cx">
</span><ins>+ this._cachedScrollTop = NaN;
+ this._cachedScrollableOffsetHeight = NaN;
+ this._previousRevealedRowCount = NaN;
+ this._topDataTableMarginHeight = NaN;
+ this._bottomDataTableMarginHeight = NaN;
+
</ins><span class="cx"> this._filterText = "";
</span><span class="cx"> this._filterDelegate = null;
</span><span class="cx">
</span><span class="lines">@@ -72,7 +78,7 @@
</span><span class="cx"> this._scrollContainerElement = document.createElement("div");
</span><span class="cx"> this._scrollContainerElement.className = "data-container";
</span><span class="cx">
</span><del>- this._scrollListener = () => this.needsLayout();
</del><ins>+ this._scrollListener = () => this._noteScrollPositionChanged();
</ins><span class="cx"> this._updateScrollListeners();
</span><span class="cx">
</span><span class="cx"> this._topDataTableMarginElement = this._scrollContainerElement.createChild("div");
</span><span class="lines">@@ -797,9 +803,12 @@
</span><span class="cx"> firstUpdate = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (layoutReason == WebInspector.View.LayoutReason.Resize || firstUpdate) {
</del><ins>+ if (layoutReason === WebInspector.View.LayoutReason.Resize || firstUpdate) {
</ins><span class="cx"> this._positionResizerElements();
</span><span class="cx"> this._positionHeaderViews();
</span><ins>+
+ this._cachedScrollTop = NaN;
+ this._cachedScrollableOffsetHeight = NaN;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._updateVisibleRows();
</span><span class="lines">@@ -963,6 +972,13 @@
</span><span class="cx"> this.needsLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _noteScrollPositionChanged()
+ {
+ this._cachedScrollTop = NaN;
+
+ this.needsLayout();
+ }
+
</ins><span class="cx"> _updateVisibleRows()
</span><span class="cx"> {
</span><span class="cx"> if (this._inline || this._variableHeightRows) {
</span><span class="lines">@@ -987,36 +1003,49 @@
</span><span class="cx">
</span><span class="cx"> let rowHeight = this.rowHeight;
</span><span class="cx"> let updateOffsetThreshold = rowHeight * 5;
</span><ins>+ let overflowPadding = updateOffsetThreshold * 3;
</ins><span class="cx">
</span><del>- let revealedRows = this._rows.filter((row) => row.revealed && !row.hidden);
</del><ins>+ if (isNaN(this._cachedScrollTop))
+ this._cachedScrollTop = this._scrollContainerElement.scrollTop;
</ins><span class="cx">
</span><del>- let scrollTop = this._scrollContainerElement.scrollTop;
- let scrollHeight = this._scrollContainerElement.offsetHeight;
</del><ins>+ if (isNaN(this._cachedScrollableOffsetHeight))
+ this._cachedScrollableOffsetHeight = this._scrollContainerElement.offsetHeight;
</ins><span class="cx">
</span><del>- let currentTopMargin = this._topDataTableMarginElement.offsetHeight;
- let currentBottomMargin = this._bottomDataTableMarginElement.offsetHeight;
- let currentTableBottom = currentTopMargin + this._dataTableElement.offsetHeight;
</del><ins>+ let scrollTop = this._cachedScrollTop;
+ let scrollableOffsetHeight = this._cachedScrollableOffsetHeight;
</ins><span class="cx">
</span><ins>+ let visibleRowCount = Math.ceil((scrollableOffsetHeight + (overflowPadding * 2)) / rowHeight);
+
+ let currentTopMargin = this._topDataTableMarginHeight;
+ let currentBottomMargin = this._bottomDataTableMarginHeight;
+ let currentTableBottom = currentTopMargin + (visibleRowCount * rowHeight);
+
</ins><span class="cx"> let belowTopThreshold = !currentTopMargin || scrollTop > currentTopMargin + updateOffsetThreshold;
</span><del>- let aboveBottomThreshold = !currentBottomMargin || scrollTop + scrollHeight < currentTableBottom - updateOffsetThreshold;
</del><ins>+ let aboveBottomThreshold = !currentBottomMargin || scrollTop + scrollableOffsetHeight < currentTableBottom - updateOffsetThreshold;
</ins><span class="cx">
</span><del>- if (belowTopThreshold && aboveBottomThreshold && this._previousRevealedRowCount === revealedRows.length)
</del><ins>+ if (belowTopThreshold && aboveBottomThreshold && !isNaN(this._previousRevealedRowCount))
</ins><span class="cx"> return;
</span><span class="cx">
</span><ins>+ let revealedRows = this._rows.filter((row) => row.revealed && !row.hidden);
+
</ins><span class="cx"> this._previousRevealedRowCount = revealedRows.length;
</span><span class="cx">
</span><del>- let overflowPadding = updateOffsetThreshold * 3;
-
</del><span class="cx"> let topHiddenRowCount = Math.max(0, Math.floor((scrollTop - overflowPadding) / rowHeight));
</span><del>- let visibleRowCount = Math.ceil((scrollHeight + (overflowPadding * 2)) / rowHeight);
- let bottomHiddenRowCount = Math.max(0, revealedRows.length - topHiddenRowCount - visibleRowCount);
</del><ins>+ let bottomHiddenRowCount = Math.max(0, this._previousRevealedRowCount - topHiddenRowCount - visibleRowCount);
</ins><span class="cx">
</span><span class="cx"> let marginTop = topHiddenRowCount * rowHeight;
</span><span class="cx"> let marginBottom = bottomHiddenRowCount * rowHeight;
</span><span class="cx">
</span><del>- this._topDataTableMarginElement.style.height = marginTop + "px";
- this._bottomDataTableMarginElement.style.height = marginBottom + "px";
</del><ins>+ if (this._topDataTableMarginHeight !== marginTop) {
+ this._topDataTableMarginHeight = marginTop;
+ this._topDataTableMarginElement.style.height = marginTop + "px";
+ }
</ins><span class="cx">
</span><ins>+ if (this._bottomDataTableMarginElement !== marginBottom) {
+ this._bottomDataTableMarginHeight = marginBottom;
+ this._bottomDataTableMarginElement.style.height = marginBottom + "px";
+ }
+
</ins><span class="cx"> this._dataTableElement.classList.toggle("odd-first-zebra-stripe", !!(topHiddenRowCount % 2));
</span><span class="cx">
</span><span class="cx"> this.dataTableBodyElement.removeChildren();
</span><span class="lines">@@ -1723,7 +1752,6 @@
</span><span class="cx"> if (!filterDidModifyNode)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this._updateVisibleRows();
</del><span class="cx"> this.dispatchEventToListeners(WebInspector.DataGrid.Event.FilterDidChange);
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -1796,6 +1824,9 @@
</span><span class="cx"> this._hidden = x;
</span><span class="cx"> if (this._element)
</span><span class="cx"> this._element.classList.toggle("hidden", this._hidden);
</span><ins>+
+ if (this.dataGrid)
+ this.dataGrid._noteRowsChanged();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get selectable()
</span><span class="lines">@@ -2170,7 +2201,7 @@
</span><span class="cx">
</span><span class="cx"> if (this.dataGrid) {
</span><span class="cx"> this.dataGrid.dispatchEventToListeners(WebInspector.DataGrid.Event.CollapsedNode, {dataGridNode: this});
</span><del>- this.dataGrid.needsLayout();
</del><ins>+ this.dataGrid._noteRowsChanged();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2220,7 +2251,7 @@
</span><span class="cx">
</span><span class="cx"> if (this.dataGrid) {
</span><span class="cx"> this.dataGrid.dispatchEventToListeners(WebInspector.DataGrid.Event.ExpandedNode, {dataGridNode: this});
</span><del>- this.dataGrid.needsLayout();
</del><ins>+ this.dataGrid._noteRowsChanged();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>