Changeset 195995 in webkit

Timestamp:

Feb 1, 2016 5:27:25 PM (8 years ago)

Author:

Matt Baker

Message:

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).

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (2 diffs)
• UserInterface/Views/DataGrid.js (modified) (1 diff)
• UserInterface/Views/OverviewTimelineView.js (modified) (2 diffs)
• UserInterface/Views/TimelineOverview.js (modified) (3 diffs)
• UserInterface/Views/TimelineRecordingContentView.js (modified) (1 diff)
• UserInterface/Views/TimelineRuler.js (modified) (3 diffs)
• UserInterface/Views/View.js (modified) (5 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-02-01  Matt Baker  <mattbaker@apple.com>
+
+        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>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -1342 +1342 @@
 WebInspector._windowResized = function(event)
 {
-    this.toolbar.updateLayout();
-    this.tabBar.updateLayout();
+    this.toolbar.updateLayout(WebInspector.View.LayoutReason.Resize);
+    this.tabBar.updateLayout(WebInspector.View.LayoutReason.Resize);
     this._tabBrowserSizeDidChange();
 };
@@ -1455 +1455 @@
 WebInspector._tabBrowserSizeDidChange = function()
 {
-    this.tabBrowser.updateLayout();
-    this.splitContentBrowser.updateLayout();
-    this.quickConsole.updateLayout();
+    this.tabBrowser.updateLayout(WebInspector.View.LayoutReason.Resize);
+    this.splitContentBrowser.updateLayout(WebInspector.View.LayoutReason.Resize);
+    this.quickConsole.updateLayout(WebInspector.View.LayoutReason.Resize);
 };
 
 WebInspector._quickConsoleDidResize = function(event)
 {
-    this.tabBrowser.updateLayout();
+    this.tabBrowser.updateLayout(WebInspector.View.LayoutReason.Resize);
 };
 

trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js

@@ -743 +743 @@
                 headerView.element.style.left = left + "px";
                 headerView.element.style.width = columnWidth + "px";
-                headerView.updateLayout();
+                headerView.updateLayout(WebInspector.View.LayoutReason.Resize);
             }
 

trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js

@@ -82 +82 @@
 
         this._treeOutlineDataGridSynchronizer.synchronize();
-        this._timelineRuler.resize();
+        this._timelineRuler.updateLayout(WebInspector.View.LayoutReason.Resize);
     }
 
@@ -159 +159 @@
 
         WebInspector.showOriginalOrFormattedSourceCodeLocation(treeElement.sourceCodeTimeline.sourceCodeLocation);
-    }
-
-    updateLayoutForResize()
-    {
-        this._timelineRuler.resize();
     }
 

trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js

@@ -266 +266 @@
         this._visible = true;
 
-        this._timelineRuler.resize()
-
         for (var timelineOverviewGraph of this._timelineOverviewGraphsMap.values())
             timelineOverviewGraph.shown();
 
-        this.updateLayout();
+        this.updateLayout(WebInspector.View.LayoutReason.Resize);
     }
 
@@ -321 +319 @@
     }
 
-    updateLayoutForResize()
-    {
-        this._cachedScrollContainerWidth = NaN;
-        this._timelineRuler.resize()
-        this.updateLayout();
-    }
-
     updateLayoutIfNeeded()
     {
@@ -354 +345 @@
     }
 
-    layout()
-    {
+    layout(layoutReason)
+    {
+        if (layoutReason === WebInspector.View.LayoutReason.Resize)
+            this._cachedScrollContainerWidth = NaN;
+
         // Calculate the required width based on the duration and seconds per pixel.
         let duration = this._endTime - this._startTime;

trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js

@@ -325 +325 @@
     }
 
-    // Protected
-
-    layout()
-    {
-        this._currentTimelineOverview.updateLayoutForResize();
-
-        let currentContentView = this._contentViewContainer.currentContentView;
-        if (currentContentView && currentContentView.updateLayoutForResize)
-            currentContentView.updateLayoutForResize();
-    }
-
     // Private
 

trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js

@@ -359 +359 @@
     }
 
-    needsLayout()
+    needsLayout(layoutReason)
     {
         if (this.layoutPending)
@@ -374 +374 @@
         }
 
-        super.needsLayout();
+        super.needsLayout(layoutReason);
     }
 
     // Protected
 
-    layout()
-    {
+    layout(layoutReason)
+    {
+        if (layoutReason === WebInspector.View.LayoutReason.Resize)
+            this._cachedClientWidth = this.element.clientWidth;
+
         let visibleWidth = this._recalculate();
         if (visibleWidth <= 0)
@@ -536 +539 @@
             this._updateSelection(visibleWidth, this.duration);
         });
-    }
-
-    resize()
-    {
-        this._cachedClientWidth = this.element.clientWidth;
-        this._recalculate();
     }
 

trunk/Source/WebInspectorUI/UserInterface/Views/View.js

@@ -38 +38 @@
         this._needsLayoutWhenAttachedToRoot = false;
         this._isAttachedToRoot = false;
+        this._layoutReason = null;
     }
 
@@ -138 +139 @@
     }
 
-    updateLayout()
+    updateLayout(layoutReason)
     {
         WebInspector.View._cancelScheduledLayoutForView(this);
+
+        this._setLayoutReason(layoutReason);
         this._layoutSubtree();
     }
@@ -152 +155 @@
     }
 
-    needsLayout()
-    {
+    needsLayout(layoutReason)
+    {
+        this._setLayoutReason(layoutReason);
+
         if (this._dirty)
             return;
@@ -210 +215 @@
         this._dirtyDescendantsCount = 0;
 
-        this.layout();
-
-        for (let view of this._subviews)
+        this.layout(this._layoutReason);
+
+        for (let view of this._subviews) {
+            view._setLayoutReason(this._layoutReason);
             view._layoutSubtree();
+        }
+
+        this._layoutReason = null;
+    }
+
+    _setLayoutReason(layoutReason)
+    {
+        if (this._layoutReason === WebInspector.View.LayoutReason.Resize)
+            return;
+
+        this._layoutReason = layoutReason || WebInspector.View.LayoutReason.Dirty;
     }
 
@@ -284 +301 @@
 };
 
+WebInspector.View.LayoutReason = {
+    Dirty: Symbol("layout-reason-dirty"),
+    Resize: Symbol("layout-reason-resize")
+};
+
 WebInspector.View._rootView = null;
 WebInspector.View._scheduledLayoutUpdateIdentifier = undefined;