<!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>[198645] 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/198645">198645</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-24 15:20:52 -0700 (Thu, 24 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Reduce forced layouts
https://bugs.webkit.org/show_bug.cgi?id=155852
<rdar://problem/25345197>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-03-24
Reviewed by Timothy Hatcher.
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid.prototype.layout):
(WebInspector.DataGrid.prototype._positionResizerElements):
(WebInspector.DataGrid.prototype._positionHeaderViews):
In loops, force layout once, calculate values, then set styles.
* UserInterface/Views/RadioButtonNavigationItem.js:
(WebInspector.RadioButtonNavigationItem):
(WebInspector.RadioButtonNavigationItem.prototype.updateLayout):
Force layout once to calculate the min-width, then never again.</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>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsRadioButtonNavigationItemjs">trunk/Source/WebInspectorUI/UserInterface/Views/RadioButtonNavigationItem.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (198644 => 198645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-24 22:18:48 UTC (rev 198644)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-24 22:20:52 UTC (rev 198645)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-03-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Reduce forced layouts
+ https://bugs.webkit.org/show_bug.cgi?id=155852
+ <rdar://problem/25345197>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid.prototype.layout):
+ (WebInspector.DataGrid.prototype._positionResizerElements):
+ (WebInspector.DataGrid.prototype._positionHeaderViews):
+ In loops, force layout once, calculate values, then set styles.
+
+ * UserInterface/Views/RadioButtonNavigationItem.js:
+ (WebInspector.RadioButtonNavigationItem):
+ (WebInspector.RadioButtonNavigationItem.prototype.updateLayout):
+ Force layout once to calculate the min-width, then never again.
+
+2016-03-24 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Open Resource Dialog should not system beep when using Enter to select an item
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155853
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (198644 => 198645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-03-24 22:18:48 UTC (rev 198644)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-03-24 22:20:52 UTC (rev 198645)
</span><span class="lines">@@ -606,19 +606,27 @@
</span><span class="cx"> var headerTableColumnElements = this._headerTableColumnGroupElement.children;
</span><span class="cx"> var tableWidth = this._dataTableElement.offsetWidth;
</span><span class="cx"> var numColumns = headerTableColumnElements.length;
</span><del>- for (var i = 0; i < numColumns; i++) {
- var headerCellElement = this._headerTableBodyElement.rows[0].cells[i]
</del><ins>+ var cells = this._headerTableBodyElement.rows[0].cells;
+
+ // Calculate widths.
+ var columnWidths = [];
+ for (var i = 0; i < numColumns; ++i) {
+ var headerCellElement = cells[i];
</ins><span class="cx"> if (this._isColumnVisible(headerCellElement.columnIdentifier)) {
</span><span class="cx"> var columnWidth = headerCellElement.offsetWidth;
</span><span class="cx"> var percentWidth = ((columnWidth / tableWidth) * 100) + "%";
</span><del>- this._headerTableColumnGroupElement.children[i].style.width = percentWidth;
- this._dataTableColumnGroupElement.children[i].style.width = percentWidth;
- } else {
- this._headerTableColumnGroupElement.children[i].style.width = 0;
- this._dataTableColumnGroupElement.children[i].style.width = 0;
- }
</del><ins>+ columnWidths.push(percentWidth);
+ } else
+ columnWidths.push(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Apply widths.
+ for (var i = 0; i < numColumns; i++) {
+ let percentWidth = columnWidths[i];
+ this._headerTableColumnGroupElement.children[i].style.width = percentWidth;
+ this._dataTableColumnGroupElement.children[i].style.width = percentWidth;
+ }
+
</ins><span class="cx"> this._columnWidthsInitialized = true;
</span><span class="cx"> firstUpdate = true;
</span><span class="cx"> }
</span><span class="lines">@@ -693,22 +701,31 @@
</span><span class="cx"> var previousResizer = null;
</span><span class="cx">
</span><span class="cx"> // Make n - 1 resizers for n columns.
</span><del>- for (var i = 0; i < this.orderedColumns.length - 1; ++i) {
</del><ins>+ var numResizers = this.orderedColumns.length - 1;
+
+ // Calculate left offsets.
+ // Get the width of the cell in the first (and only) row of the
+ // header table in order to determine the width of the column, since
+ // it is not possible to query a column for its width.
+ var cells = this._headerTableBodyElement.rows[0].cells;
+ var columnWidths = [];
+ for (var i = 0; i < numResizers; ++i) {
+ left += cells[i].getBoundingClientRect().width;
+ columnWidths.push(left);
+ }
+
+ // Apply left offsets.
+ for (var i = 0; i < numResizers; ++i) {
</ins><span class="cx"> // Create a new resizer if one does not exist for this column.
</span><del>- if (i === this.resizers.length) {
- resizer = new WebInspector.Resizer(WebInspector.Resizer.RuleOrientation.Vertical, this);
- this.resizers[i] = resizer;
- // This resizer is associated with the column to its right.
</del><ins>+ // This resizer is associated with the column to its right.
+ var resizer = this.resizers[i];
+ if (!resizer) {
+ resizer = this.resizers[i] = new WebInspector.Resizer(WebInspector.Resizer.RuleOrientation.Vertical, this);
</ins><span class="cx"> this.element.appendChild(resizer.element);
</span><span class="cx"> }
</span><ins>+
+ left = columnWidths[i];
</ins><span class="cx">
</span><del>- var resizer = this.resizers[i];
-
- // Get the width of the cell in the first (and only) row of the
- // header table in order to determine the width of the column, since
- // it is not possible to query a column for its width.
- left += this._headerTableBodyElement.rows[0].cells[i].getBoundingClientRect().width;
-
</del><span class="cx"> if (this._isColumnVisible(this.orderedColumns[i])) {
</span><span class="cx"> resizer.element.style.removeProperty("display");
</span><span class="cx"> resizer.element.style.left = left + "px";
</span><span class="lines">@@ -740,6 +757,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> let left = 0;
</span><ins>+ let headerViews = [];
+ let lefts = [];
+ let columnWidths = [];
+
+ // Calculate left offsets and widths.
</ins><span class="cx"> for (let columnIdentifier of this.orderedColumns) {
</span><span class="cx"> let column = this.columns.get(columnIdentifier);
</span><span class="cx"> console.assert(column, "Missing column data for header cell with columnIdentifier " + columnIdentifier);
</span><span class="lines">@@ -749,13 +771,21 @@
</span><span class="cx"> let columnWidth = this._headerTableCellElements.get(columnIdentifier).offsetWidth;
</span><span class="cx"> let headerView = column["headerView"];
</span><span class="cx"> if (headerView) {
</span><del>- headerView.element.style.left = left + "px";
- headerView.element.style.width = columnWidth + "px";
- headerView.updateLayout(WebInspector.View.LayoutReason.Resize);
</del><ins>+ headerViews.push(headerView);
+ lefts.push(left);
+ columnWidths.push(columnWidth);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> left += columnWidth;
</span><span class="cx"> }
</span><ins>+
+ // Apply left offsets and widths.
+ for (let i = 0; i < headerViews.length; ++i) {
+ let headerView = headerViews[i];
+ headerView.element.style.left = lefts[i] + "px";
+ headerView.element.style.width = columnWidths[i] + "px";
+ headerView.updateLayout(WebInspector.View.LayoutReason.Resize);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> addPlaceholderNode()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRadioButtonNavigationItemjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RadioButtonNavigationItem.js (198644 => 198645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RadioButtonNavigationItem.js 2016-03-24 22:18:48 UTC (rev 198644)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RadioButtonNavigationItem.js 2016-03-24 22:20:52 UTC (rev 198645)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx"> constructor(identifier, toolTip, image, imageWidth, imageHeight)
</span><span class="cx"> {
</span><span class="cx"> super(identifier, toolTip, image, imageWidth, imageHeight, null, "tab");
</span><ins>+
+ this._initializedMinWidth = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="lines">@@ -70,9 +72,13 @@
</span><span class="cx"> this.element.setAttribute("aria-selected", "true");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var selectedWidth = this.element.offsetWidth;
- if (selectedWidth)
- this.element.style.minWidth = selectedWidth + "px";
</del><ins>+ if (!this._initializedMinWidth) {
+ var width = this.element.offsetWidth;
+ if (width) {
+ this._initializedMinWidth = true;
+ this.element.style.minWidth = width + "px";
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> if (!isSelected) {
</span><span class="cx"> this.element.classList.remove(WebInspector.RadioButtonNavigationItem.SelectedStyleClassName);
</span></span></pre>
</div>
</div>
</body>
</html>