<!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>[195995] 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/195995">195995</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-02-01 17:27:25 -0800 (Mon, 01 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: add a LayoutReason enum to the View base class
https://bugs.webkit.org/show_bug.cgi?id=153731
<rdar://problem/24430938>
Reviewed by Brian Burg.
Added a LayoutReason enum to the View base class, which can be passed as an optional
argument to needsLayout() and updateLayout(). The value is propagated to the view's
subtree during layout.
* UserInterface/Base/Main.js:
Update top-level views with Resize layout reason when window is resized.
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid.prototype._positionHeaderViews):
Update header view with Resize layout reason when column is resized.
* UserInterface/Views/OverviewTimelineView.js:
(WebInspector.OverviewTimelineView.prototype.shown):
Assume the view has been resized when shown, and update layout.
(WebInspector.OverviewTimelineView.prototype.updateLayoutForResize): Deleted.
No longer needed, handled by the View base class.
* UserInterface/Views/TimelineOverview.js:
(WebInspector.TimelineOverview.prototype.shown):
Assume the view has been resized when shown, and update layout.
(WebInspector.TimelineOverview.prototype.layout):
Invalidate cached scroll container width if resized.
(WebInspector.TimelineOverview.prototype.updateLayoutForResize): Deleted.
No longer needed, handled by the View base class.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView.prototype.layout): Deleted.
No longer needed, handled by the View base class.
* UserInterface/Views/TimelineRuler.js:
(WebInspector.TimelineRuler.prototype.needsLayout):
(WebInspector.TimelineRuler.prototype.layout):
Update cached client width if resized.
(WebInspector.TimelineRuler.prototype.resize): Deleted.
Moved resize logic to layout override.
* UserInterface/Views/View.js:
(WebInspector.View):
(WebInspector.View.prototype.updateLayout):
Set layout reason.
(WebInspector.View.prototype.needsLayout):
Set layout reason even if an animation frame has already been scheduled,
since the layout reason could have changed.
(WebInspector.View.prototype._layoutSubtree):
Propagate layout reason to subtree, and reset the value when done.
(WebInspector.View.prototype._setLayoutReason):
Helper method for updating the layout reason. Ensures that LayoutReason.Resize
has priority over the default (LayoutReason.Dirty).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsOverviewTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/View.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (195994 => 195995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-02-02 01:12:48 UTC (rev 195994)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-02-02 01:27:25 UTC (rev 195995)
</span><span class="lines">@@ -1,5 +1,62 @@
</span><span class="cx"> 2016-02-01 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: add a LayoutReason enum to the View base class
+ https://bugs.webkit.org/show_bug.cgi?id=153731
+ <rdar://problem/24430938>
+
+ Reviewed by Brian Burg.
+
+ Added a LayoutReason enum to the View base class, which can be passed as an optional
+ argument to needsLayout() and updateLayout(). The value is propagated to the view's
+ subtree during layout.
+
+ * UserInterface/Base/Main.js:
+ Update top-level views with Resize layout reason when window is resized.
+
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid.prototype._positionHeaderViews):
+ Update header view with Resize layout reason when column is resized.
+
+ * UserInterface/Views/OverviewTimelineView.js:
+ (WebInspector.OverviewTimelineView.prototype.shown):
+ Assume the view has been resized when shown, and update layout.
+ (WebInspector.OverviewTimelineView.prototype.updateLayoutForResize): Deleted.
+ No longer needed, handled by the View base class.
+
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview.prototype.shown):
+ Assume the view has been resized when shown, and update layout.
+ (WebInspector.TimelineOverview.prototype.layout):
+ Invalidate cached scroll container width if resized.
+ (WebInspector.TimelineOverview.prototype.updateLayoutForResize): Deleted.
+ No longer needed, handled by the View base class.
+
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype.layout): Deleted.
+ No longer needed, handled by the View base class.
+
+ * UserInterface/Views/TimelineRuler.js:
+ (WebInspector.TimelineRuler.prototype.needsLayout):
+ (WebInspector.TimelineRuler.prototype.layout):
+ Update cached client width if resized.
+ (WebInspector.TimelineRuler.prototype.resize): Deleted.
+ Moved resize logic to layout override.
+
+ * UserInterface/Views/View.js:
+ (WebInspector.View):
+ (WebInspector.View.prototype.updateLayout):
+ Set layout reason.
+ (WebInspector.View.prototype.needsLayout):
+ Set layout reason even if an animation frame has already been scheduled,
+ since the layout reason could have changed.
+ (WebInspector.View.prototype._layoutSubtree):
+ Propagate layout reason to subtree, and reset the value when done.
+ (WebInspector.View.prototype._setLayoutReason):
+ Helper method for updating the layout reason. Ensures that LayoutReason.Resize
+ has priority over the default (LayoutReason.Dirty).
+
+2016-02-01 Matt Baker <mattbaker@apple.com>
+
</ins><span class="cx"> Web Inspector: Rendering Frames timeline draws all frame bars at minimum height
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153736
</span><span class="cx"> <rdar://problem/21946301>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (195994 => 195995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-02-02 01:12:48 UTC (rev 195994)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-02-02 01:27:25 UTC (rev 195995)
</span><span class="lines">@@ -1341,8 +1341,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector._windowResized = function(event)
</span><span class="cx"> {
</span><del>- this.toolbar.updateLayout();
- this.tabBar.updateLayout();
</del><ins>+ this.toolbar.updateLayout(WebInspector.View.LayoutReason.Resize);
+ this.tabBar.updateLayout(WebInspector.View.LayoutReason.Resize);
</ins><span class="cx"> this._tabBrowserSizeDidChange();
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -1454,14 +1454,14 @@
</span><span class="cx">
</span><span class="cx"> WebInspector._tabBrowserSizeDidChange = function()
</span><span class="cx"> {
</span><del>- this.tabBrowser.updateLayout();
- this.splitContentBrowser.updateLayout();
- this.quickConsole.updateLayout();
</del><ins>+ this.tabBrowser.updateLayout(WebInspector.View.LayoutReason.Resize);
+ this.splitContentBrowser.updateLayout(WebInspector.View.LayoutReason.Resize);
+ this.quickConsole.updateLayout(WebInspector.View.LayoutReason.Resize);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector._quickConsoleDidResize = function(event)
</span><span class="cx"> {
</span><del>- this.tabBrowser.updateLayout();
</del><ins>+ this.tabBrowser.updateLayout(WebInspector.View.LayoutReason.Resize);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector._sidebarWidthDidChange = function(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (195994 => 195995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-02-02 01:12:48 UTC (rev 195994)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-02-02 01:27:25 UTC (rev 195995)
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx"> if (headerView) {
</span><span class="cx"> headerView.element.style.left = left + "px";
</span><span class="cx"> headerView.element.style.width = columnWidth + "px";
</span><del>- headerView.updateLayout();
</del><ins>+ headerView.updateLayout(WebInspector.View.LayoutReason.Resize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> left += columnWidth;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsOverviewTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js (195994 => 195995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2016-02-02 01:12:48 UTC (rev 195994)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2016-02-02 01:27:25 UTC (rev 195995)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> super.shown();
</span><span class="cx">
</span><span class="cx"> this._treeOutlineDataGridSynchronizer.synchronize();
</span><del>- this._timelineRuler.resize();
</del><ins>+ this._timelineRuler.updateLayout(WebInspector.View.LayoutReason.Resize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> closed()
</span><span class="lines">@@ -160,11 +160,6 @@
</span><span class="cx"> WebInspector.showOriginalOrFormattedSourceCodeLocation(treeElement.sourceCodeTimeline.sourceCodeLocation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayoutForResize()
- {
- this._timelineRuler.resize();
- }
-
</del><span class="cx"> layout()
</span><span class="cx"> {
</span><span class="cx"> let oldZeroTime = this._timelineRuler.zeroTime;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (195994 => 195995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-02-02 01:12:48 UTC (rev 195994)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-02-02 01:27:25 UTC (rev 195995)
</span><span class="lines">@@ -265,12 +265,10 @@
</span><span class="cx"> {
</span><span class="cx"> this._visible = true;
</span><span class="cx">
</span><del>- this._timelineRuler.resize()
-
</del><span class="cx"> for (var timelineOverviewGraph of this._timelineOverviewGraphsMap.values())
</span><span class="cx"> timelineOverviewGraph.shown();
</span><span class="cx">
</span><del>- this.updateLayout();
</del><ins>+ this.updateLayout(WebInspector.View.LayoutReason.Resize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> hidden()
</span><span class="lines">@@ -320,13 +318,6 @@
</span><span class="cx"> overviewGraph.selectedRecord = record;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayoutForResize()
- {
- this._cachedScrollContainerWidth = NaN;
- this._timelineRuler.resize()
- this.updateLayout();
- }
-
</del><span class="cx"> updateLayoutIfNeeded()
</span><span class="cx"> {
</span><span class="cx"> if (this.layoutPending) {
</span><span class="lines">@@ -353,8 +344,11 @@
</span><span class="cx"> console.error("Needs to be implemented by a subclass.");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- layout()
</del><ins>+ layout(layoutReason)
</ins><span class="cx"> {
</span><ins>+ if (layoutReason === WebInspector.View.LayoutReason.Resize)
+ this._cachedScrollContainerWidth = NaN;
+
</ins><span class="cx"> // Calculate the required width based on the duration and seconds per pixel.
</span><span class="cx"> let duration = this._endTime - this._startTime;
</span><span class="cx"> let newWidth = Math.ceil(duration / this._durationPerPixel);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (195994 => 195995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-02-02 01:12:48 UTC (rev 195994)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-02-02 01:27:25 UTC (rev 195995)
</span><span class="lines">@@ -324,17 +324,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Protected
-
- layout()
- {
- this._currentTimelineOverview.updateLayoutForResize();
-
- let currentContentView = this._contentViewContainer.currentContentView;
- if (currentContentView && currentContentView.updateLayoutForResize)
- currentContentView.updateLayoutForResize();
- }
-
</del><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _currentContentViewDidChange(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (195994 => 195995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2016-02-02 01:12:48 UTC (rev 195994)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2016-02-02 01:27:25 UTC (rev 195995)
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx"> this._updateSelection(visibleWidth, this.duration);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- needsLayout()
</del><ins>+ needsLayout(layoutReason)
</ins><span class="cx"> {
</span><span class="cx"> if (this.layoutPending)
</span><span class="cx"> return;
</span><span class="lines">@@ -373,13 +373,16 @@
</span><span class="cx"> this._scheduledSelectionLayoutUpdateIdentifier = undefined;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- super.needsLayout();
</del><ins>+ super.needsLayout(layoutReason);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><del>- layout()
</del><ins>+ layout(layoutReason)
</ins><span class="cx"> {
</span><ins>+ if (layoutReason === WebInspector.View.LayoutReason.Resize)
+ this._cachedClientWidth = this.element.clientWidth;
+
</ins><span class="cx"> let visibleWidth = this._recalculate();
</span><span class="cx"> if (visibleWidth <= 0)
</span><span class="cx"> return;
</span><span class="lines">@@ -537,12 +540,6 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- resize()
- {
- this._cachedClientWidth = this.element.clientWidth;
- this._recalculate();
- }
-
</del><span class="cx"> _recalculate()
</span><span class="cx"> {
</span><span class="cx"> let visibleWidth = this._cachedClientWidth;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/View.js (195994 => 195995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/View.js 2016-02-02 01:12:48 UTC (rev 195994)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/View.js 2016-02-02 01:27:25 UTC (rev 195995)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> this._dirtyDescendantsCount = 0;
</span><span class="cx"> this._needsLayoutWhenAttachedToRoot = false;
</span><span class="cx"> this._isAttachedToRoot = false;
</span><ins>+ this._layoutReason = null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Static
</span><span class="lines">@@ -137,9 +138,11 @@
</span><span class="cx"> this.removeSubview(oldView);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
</del><ins>+ updateLayout(layoutReason)
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.View._cancelScheduledLayoutForView(this);
</span><ins>+
+ this._setLayoutReason(layoutReason);
</ins><span class="cx"> this._layoutSubtree();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -151,8 +154,10 @@
</span><span class="cx"> this.updateLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- needsLayout()
</del><ins>+ needsLayout(layoutReason)
</ins><span class="cx"> {
</span><ins>+ this._setLayoutReason(layoutReason);
+
</ins><span class="cx"> if (this._dirty)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -209,12 +214,24 @@
</span><span class="cx"> this._dirty = false;
</span><span class="cx"> this._dirtyDescendantsCount = 0;
</span><span class="cx">
</span><del>- this.layout();
</del><ins>+ this.layout(this._layoutReason);
</ins><span class="cx">
</span><del>- for (let view of this._subviews)
</del><ins>+ for (let view of this._subviews) {
+ view._setLayoutReason(this._layoutReason);
</ins><span class="cx"> view._layoutSubtree();
</span><ins>+ }
+
+ this._layoutReason = null;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ _setLayoutReason(layoutReason)
+ {
+ if (this._layoutReason === WebInspector.View.LayoutReason.Resize)
+ return;
+
+ this._layoutReason = layoutReason || WebInspector.View.LayoutReason.Dirty;
+ }
+
</ins><span class="cx"> // Layout controller logic
</span><span class="cx">
</span><span class="cx"> static _scheduleLayoutForView(view)
</span><span class="lines">@@ -283,5 +300,10 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector.View.LayoutReason = {
+ Dirty: Symbol("layout-reason-dirty"),
+ Resize: Symbol("layout-reason-resize")
+};
+
</ins><span class="cx"> WebInspector.View._rootView = null;
</span><span class="cx"> WebInspector.View._scheduledLayoutUpdateIdentifier = undefined;
</span></span></pre>
</div>
</div>
</body>
</html>