<!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>[193325] 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/193325">193325</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:10:54 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192612">r192612</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsBackForwardEntryjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsApplicationCacheFrameContentViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsButtonNavigationItemjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsContentBrowserjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDatabaseTableContentViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsSidebarjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Sidebar.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTextResourceContentViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.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 (193324 => 193325)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:10:46 UTC (rev 193324)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:10:54 UTC (rev 193325)
</span><span class="lines">@@ -1,5 +1,57 @@
</span><span class="cx"> 2015-12-03 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192612. rdar://problem/23221163
+
+ 2015-11-18 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Reduce synchronous view layouts
+ https://bugs.webkit.org/show_bug.cgi?id=151058
+
+ Reviewed by Timothy Hatcher.
+
+ Replace calls to View.updateLayout with needsLayout, when a synchronous layout
+ isn't absolutely necessary.
+
+ * UserInterface/Models/BackForwardEntry.js:
+ (WebInspector.BackForwardEntry.prototype.prepareToShow):
+
+ * UserInterface/Views/ApplicationCacheFrameContentView.js:
+ (WebInspector.ApplicationCacheFrameContentView.prototype.updateLayout): Deleted.
+ View subclasses shouldn't override updateLayout.
+
+ * UserInterface/Views/ButtonNavigationItem.js:
+ (WebInspector.ButtonNavigationItem.prototype.set label):
+
+ * UserInterface/Views/ContentBrowser.js:
+ (WebInspector.ContentBrowser.prototype._contentViewSelectionPathComponentDidChange):
+ (WebInspector.ContentBrowser.prototype._currentContentViewDidChange):
+ (WebInspector.ContentBrowser.prototype._contentViewNavigationItemsDidChange):
+
+ * UserInterface/Views/DatabaseTableContentView.js:
+ (WebInspector.DatabaseTableContentView.prototype._queryFinished):
+ Just update DataGrid's layout, not the whole view. The grid is the only subview
+ so the result is identical, but the intent is cleared this way.
+ (WebInspector.DatabaseTableContentView.prototype.updateLayout): Deleted.
+ View subclasses shouldn't override updateLayout.
+
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView.prototype.didAppendConsoleMessageView):
+ (WebInspector.LogContentView.prototype.promptDidChangeHeight): Deleted.
+ Unused code.
+
+ * UserInterface/Views/Sidebar.js:
+ (WebInspector.Sidebar.prototype.set width):
+ (WebInspector.Sidebar.prototype.set collapsed):
+
+ * UserInterface/Views/TextResourceContentView.js:
+ (WebInspector.TextResourceContentView.prototype._contentWillPopulate):
+ Add TextEditor as a subview.
+ (WebInspector.TextResourceContentView.prototype.updateLayout): Deleted.
+ View subclasses shouldn't override updateLayout.
+
+
+2015-12-03 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r192594. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-11-18 Matt Baker <mattbaker@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsBackForwardEntryjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js (193324 => 193325)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js 2015-12-03 19:10:46 UTC (rev 193324)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js 2015-12-03 19:10:54 UTC (rev 193325)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> this.contentView.visible = true;
</span><span class="cx"> if (shouldCallShown)
</span><span class="cx"> this.contentView.shown();
</span><del>- this.contentView.updateLayout();
</del><ins>+ this.contentView.needsLayout();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> prepareToHide()
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsApplicationCacheFrameContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js (193324 => 193325)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js 2015-12-03 19:10:46 UTC (rev 193324)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js 2015-12-03 19:10:54 UTC (rev 193325)
</span><span class="lines">@@ -57,12 +57,6 @@
</span><span class="cx"> WebInspector.applicationCacheManager.removeEventListener(null, null, this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- if (this.dataGrid)
- this.dataGrid.updateLayout();
- }
-
</del><span class="cx"> saveToCookie(cookie)
</span><span class="cx"> {
</span><span class="cx"> cookie.type = WebInspector.ContentViewCookieType.ApplicationCache;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsButtonNavigationItemjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.js (193324 => 193325)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.js 2015-12-03 19:10:46 UTC (rev 193324)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.js 2015-12-03 19:10:54 UTC (rev 193325)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> this._element.classList.add(WebInspector.ButtonNavigationItem.TextOnlyClassName);
</span><span class="cx"> this._element.textContent = newLabel || "";
</span><span class="cx"> if (this.parentNavigationBar)
</span><del>- this.parentNavigationBar.updateLayout();
</del><ins>+ this.parentNavigationBar.needsLayout();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get image()
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsContentBrowserjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js (193324 => 193325)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-12-03 19:10:46 UTC (rev 193324)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-12-03 19:10:54 UTC (rev 193325)
</span><span class="lines">@@ -435,7 +435,7 @@
</span><span class="cx">
</span><span class="cx"> this._updateContentViewNavigationItems();
</span><span class="cx">
</span><del>- this._navigationBar.updateLayout();
</del><ins>+ this._navigationBar.needsLayout();
</ins><span class="cx">
</span><span class="cx"> this._dispatchCurrentRepresentedObjectsDidChangeEventSoon();
</span><span class="cx"> }
</span><span class="lines">@@ -459,7 +459,7 @@
</span><span class="cx"> this._updateContentViewNavigationItems();
</span><span class="cx"> this._updateFindBanner(currentContentView);
</span><span class="cx">
</span><del>- this._navigationBar.updateLayout();
</del><ins>+ this._navigationBar.needsLayout();
</ins><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentBrowser.Event.CurrentContentViewDidChange);
</span><span class="cx">
</span><span class="lines">@@ -472,7 +472,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._updateContentViewNavigationItems();
</span><del>- this._navigationBar.updateLayout();
</del><ins>+ this._navigationBar.needsLayout();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _hierarchicalPathComponentWasSelected(event)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDatabaseTableContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js (193324 => 193325)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js 2015-12-03 19:10:46 UTC (rev 193324)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js 2015-12-03 19:10:54 UTC (rev 193325)
</span><span class="lines">@@ -50,12 +50,6 @@
</span><span class="cx"> this.representedObject.database.executeSQL("SELECT * FROM \"" + this._escapeTableName(this.representedObject.name) + "\"", this._queryFinished.bind(this), this._queryError.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- if (this._dataGrid)
- this._dataGrid.updateLayout();
- }
-
</del><span class="cx"> saveToCookie(cookie)
</span><span class="cx"> {
</span><span class="cx"> cookie.type = WebInspector.ContentViewCookieType.DatabaseTable;
</span><span class="lines">@@ -95,7 +89,7 @@
</span><span class="cx"> this._dataGrid = WebInspector.DataGrid.createSortableDataGrid(columnNames, values);
</span><span class="cx">
</span><span class="cx"> this.addSubview(this._dataGrid);
</span><del>- this.updateLayout();
</del><ins>+ this._dataGrid.updateLayout();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (193324 => 193325)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-12-03 19:10:46 UTC (rev 193324)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-12-03 19:10:54 UTC (rev 193325)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> {
</span><span class="cx"> console.assert(messageView instanceof WebInspector.ConsoleMessageView || messageView instanceof WebInspector.ConsoleCommandView);
</span><span class="cx">
</span><del>- WebInspector.quickConsole.updateLayout();
</del><ins>+ WebInspector.quickConsole.needsLayout();
</ins><span class="cx">
</span><span class="cx"> // Nest the message.
</span><span class="cx"> var type = messageView instanceof WebInspector.ConsoleCommandView ? null : messageView.message.type;
</span><span class="lines">@@ -166,11 +166,6 @@
</span><span class="cx"> this._logViewController.scrollToBottom();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- promptDidChangeHeight()
- {
- WebInspector.quickConsole.updateLayout();
- }
-
</del><span class="cx"> get supportsSearch()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsSidebarjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Sidebar.js (193324 => 193325)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Sidebar.js 2015-12-03 19:10:46 UTC (rev 193324)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Sidebar.js 2015-12-03 19:10:54 UTC (rev 193325)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> this.element.style.width = newWidth + "px";
</span><span class="cx">
</span><span class="cx"> if (!this.collapsed && this._navigationBar)
</span><del>- this._navigationBar.updateLayout();
</del><ins>+ this._navigationBar.needsLayout();
</ins><span class="cx">
</span><span class="cx"> if (!this.collapsed && this._selectedSidebarPanel)
</span><span class="cx"> this._selectedSidebarPanel.widthDidChange();
</span><span class="lines">@@ -203,10 +203,8 @@
</span><span class="cx"> this._collapsed = flag || false;
</span><span class="cx"> this.element.classList.toggle(WebInspector.Sidebar.CollapsedStyleClassName);
</span><span class="cx">
</span><del>- if (!this._collapsed) {
- if (this._navigationBar)
- this._navigationBar.updateLayout();
- }
</del><ins>+ if (!this._collapsed && this._navigationBar)
+ this._navigationBar.needsLayout();
</ins><span class="cx">
</span><span class="cx"> if (this._selectedSidebarPanel) {
</span><span class="cx"> if (this._selectedSidebarPanel.visible)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTextResourceContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js (193324 => 193325)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js 2015-12-03 19:10:46 UTC (rev 193324)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js 2015-12-03 19:10:54 UTC (rev 193325)
</span><span class="lines">@@ -174,16 +174,11 @@
</span><span class="cx"> this._textEditor.revealNextSearchResult(changeFocus);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- this._textEditor.updateLayout();
- }
-
</del><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _contentWillPopulate(event)
</span><span class="cx"> {
</span><del>- if (this._textEditor.element.parentNode === this.element)
</del><ins>+ if (this._textEditor.parentView === this)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Check the MIME-type for CSS since Resource.Type.Stylesheet also includes XSL, which we can't edit yet.
</span><span class="lines">@@ -195,7 +190,7 @@
</span><span class="cx"> this._textEditor.readOnly = false;
</span><span class="cx">
</span><span class="cx"> this.element.removeChildren();
</span><del>- this.element.appendChild(this._textEditor.element);
</del><ins>+ this.addSubview(this._textEditor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _contentDidPopulate(event)
</span></span></pre>
</div>
</div>
</body>
</html>