Changeset 223569 in webkit

Timestamp:

Oct 17, 2017 1:09:15 PM (7 years ago)

Author:

Alan Bujtas

Message:

[FrameView::layout cleanup] Subtree should read subtreeLayout.
​https://bugs.webkit.org/show_bug.cgi?id=178401

Reviewed by Simon Fraser.

Rename some variables to improve readability.

No change in functionality.

• page/FrameView.cpp:

(WebCore::SubtreeLayoutStateMaintainer::SubtreeLayoutStateMaintainer):
(WebCore::SubtreeLayoutStateMaintainer::~SubtreeLayoutStateMaintainer):
(WebCore::SubtreeLayoutStateMaintainer::shouldDisableLayoutStateForSubtree):
(WebCore::FrameView::reset):
(WebCore::FrameView::willDestroyRenderTree):
(WebCore::FrameView::didDestroyRenderTree):
(WebCore::FrameView::calculateScrollbarModesForLayout):
(WebCore::FrameView::layout):
(WebCore::FrameView::convertSubtreeLayoutToFullLayout):
(WebCore::FrameView::scheduleRelayout):
(WebCore::FrameView::scheduleRelayoutOfSubtree):
(WebCore::FrameView::needsLayout const):
(WebCore::FrameView::autoSizeIfEnabled):

• page/FrameView.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• page/FrameView.cpp (modified) (29 diffs)
• page/FrameView.h (modified) (2 diffs)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (3 diffs)
• rendering/RenderElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-17  Zalan Bujtas  <zalan@apple.com>
+
+        [FrameView::layout cleanup] Subtree should read subtreeLayout.
+        https://bugs.webkit.org/show_bug.cgi?id=178401
+
+        Reviewed by Simon Fraser.
+
+        Rename some variables to improve readability.
+
+        No change in functionality.
+
+        * page/FrameView.cpp:
+        (WebCore::SubtreeLayoutStateMaintainer::SubtreeLayoutStateMaintainer):
+        (WebCore::SubtreeLayoutStateMaintainer::~SubtreeLayoutStateMaintainer):
+        (WebCore::SubtreeLayoutStateMaintainer::shouldDisableLayoutStateForSubtree):
+        (WebCore::FrameView::reset):
+        (WebCore::FrameView::willDestroyRenderTree):
+        (WebCore::FrameView::didDestroyRenderTree):
+        (WebCore::FrameView::calculateScrollbarModesForLayout):
+        (WebCore::FrameView::layout):
+        (WebCore::FrameView::convertSubtreeLayoutToFullLayout):
+        (WebCore::FrameView::scheduleRelayout):
+        (WebCore::FrameView::scheduleRelayoutOfSubtree):
+        (WebCore::FrameView::needsLayout const):
+        (WebCore::FrameView::autoSizeIfEnabled):
+        * page/FrameView.h:
+
 2017-10-16  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -2069 +2069 @@
             }
             
-            if (currRenderer == frameView->layoutRoot())
+            if (currRenderer == frameView->subtreeLayoutRoot())
                 break;
         }

trunk/Source/WebCore/page/FrameView.cpp

@@ -167 +167 @@
 public:
     SubtreeLayoutStateMaintainer(RenderElement* subtreeLayoutRoot)
-        : m_layoutRoot(subtreeLayoutRoot)
+        : m_subtreeLayoutRoot(subtreeLayoutRoot)
     {
-        if (m_layoutRoot) {
-            RenderView& view = m_layoutRoot->view();
-            view.pushLayoutState(*m_layoutRoot);
+        if (m_subtreeLayoutRoot) {
+            RenderView& view = m_subtreeLayoutRoot->view();
+            view.pushLayoutState(*m_subtreeLayoutRoot);
             if (shouldDisableLayoutStateForSubtree()) {
                 view.disableLayoutState();
@@ -181 +181 @@
     ~SubtreeLayoutStateMaintainer()
     {
-        if (m_layoutRoot) {
-            RenderView& view = m_layoutRoot->view();
-            view.popLayoutState(*m_layoutRoot);
+        if (m_subtreeLayoutRoot) {
+            RenderView& view = m_subtreeLayoutRoot->view();
+            view.popLayoutState(*m_subtreeLayoutRoot);
             if (m_didDisableLayoutState)
                 view.enableLayoutState();
@@ -191 +191 @@
     bool shouldDisableLayoutStateForSubtree()
     {
-        for (auto* renderer = m_layoutRoot; renderer; renderer = renderer->container()) {
+        for (auto* renderer = m_subtreeLayoutRoot; renderer; renderer = renderer->container()) {
             if (renderer->hasTransform() || renderer->hasReflection())
                 return true;
@@ -199 +199 @@
     
 private:
-    RenderElement* m_layoutRoot { nullptr };
+    RenderElement* m_subtreeLayoutRoot { nullptr };
     bool m_didDisableLayoutState { false };
 };
@@ -337 +337 @@
     m_contentIsOpaque = false;
     m_layoutTimer.stop();
-    m_layoutRoot = nullptr;
+    m_subtreeLayoutRoot = nullptr;
     m_delayedLayout = false;
     m_needsFullRepaint = true;
@@ -656 +656 @@
 {
     detachCustomScrollbars();
-    m_layoutRoot = nullptr;
+    m_subtreeLayoutRoot = nullptr;
 }
 
 void FrameView::didDestroyRenderTree()
 {
-    ASSERT(!m_layoutRoot);
+    ASSERT(!m_subtreeLayoutRoot);
     ASSERT(m_widgetsInRenderTree.isEmpty());
 
@@ -829 +829 @@
     }
     
-    if (m_layoutRoot)
+    if (m_subtreeLayoutRoot)
         return;
     
@@ -1323 +1323 @@
 #endif
 
-void FrameView::layout(bool allowSubtree)
+void FrameView::layout(bool allowSubtreeLayout)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(!frame().document()->inRenderTreeUpdate());
 
-    LOG(Layout, "FrameView %p (%dx%d) layout, main frameview %d, allowSubtree=%d", this, size().width(), size().height(), frame().isMainFrame(), allowSubtree);
+    LOG(Layout, "FrameView %p (%dx%d) layout, main frameview %d, allowSubtreeLayout=%d", this, size().width(), size().height(), frame().isMainFrame(), allowSubtreeLayout);
     if (isInRenderTreeLayout()) {
         LOG(Layout, "  in layout, bailing");
@@ -1355 +1355 @@
             m_frameFlatteningViewSizeForMediaQuery = ScrollView::layoutSize();
         }
-        startLayoutAtMainFrameViewIfNeeded(allowSubtree);
-        RenderElement* root = m_layoutRoot ? m_layoutRoot : frame().document()->renderView();
-        if (!root || !root->needsLayout())
+        startLayoutAtMainFrameViewIfNeeded(allowSubtreeLayout);
+        auto* layoutRoot = m_subtreeLayoutRoot ? m_subtreeLayoutRoot : frame().document()->renderView();
+        if (!layoutRoot || !layoutRoot->needsLayout())
             return;
     }
@@ -1365 +1365 @@
 #if PLATFORM(IOS)
     if (updateFixedPositionLayoutRect())
-        allowSubtree = false;
+        allowSubtreeLayout = false;
 #endif
 
@@ -1380 +1380 @@
     AnimationUpdateBlock animationUpdateBlock(&frame().animation());
     
-    if (!allowSubtree && m_layoutRoot)
+    if (!allowSubtreeLayout && m_subtreeLayoutRoot)
         convertSubtreeLayoutToFullLayout();
 
@@ -1388 +1388 @@
     Document& document = *frame().document();
     ASSERT(document.pageCacheState() == Document::NotInPageCache);
-    RenderElement* root = nullptr;
+    RenderElement* layoutRoot = nullptr;
     RenderLayer* layer = nullptr;
-    bool subtree = false;
+    bool isSubtreeLayout = false;
 
     {
@@ -1430 +1430 @@
         autoSizeIfEnabled();
 
-        root = m_layoutRoot ? m_layoutRoot : document.renderView();
-        if (!root)
+        layoutRoot = m_subtreeLayoutRoot ? m_subtreeLayoutRoot : document.renderView();
+        if (!layoutRoot)
             return;
-        subtree = m_layoutRoot;
-
-        if (!m_layoutRoot) {
+        isSubtreeLayout = m_subtreeLayoutRoot;
+
+        if (!isSubtreeLayout) {
             auto* body = document.bodyOrFrameset();
             if (body && body->renderer()) {
@@ -1452 +1452 @@
         }
 
-        m_needsFullRepaint = !subtree && (m_firstLayout || downcast<RenderView>(*root).printing());
-
-        if (!subtree) {
+        m_needsFullRepaint = !isSubtreeLayout && (m_firstLayout || downcast<RenderView>(*layoutRoot).printing());
+
+        if (!isSubtreeLayout) {
             ScrollbarMode hMode;
             ScrollbarMode vMode;    
@@ -1466 +1466 @@
                     m_firstLayoutCallbackPending = true;
                     m_lastViewportSize = sizeForResizeEvent();
-                    m_lastZoomFactor = root->style().zoom();
+                    m_lastZoomFactor = layoutRoot->style().zoom();
 
                     // Set the initial vMode to AlwaysOn if we're auto.
@@ -1503 +1503 @@
         }
 
-        layer = root->enclosingLayer();
-        SubtreeLayoutStateMaintainer subtreeLayoutStateMaintainer(m_layoutRoot);
-
-        RenderView::RepaintRegionAccumulator repaintRegionAccumulator(&root->view());
+        ASSERT(allowSubtreeLayout || !isSubtreeLayout);
+        layer = layoutRoot->enclosingLayer();
+        SubtreeLayoutStateMaintainer subtreeLayoutStateMaintainer(m_subtreeLayoutRoot);
+
+        RenderView::RepaintRegionAccumulator repaintRegionAccumulator(&layoutRoot->view());
 
         ASSERT(m_layoutPhase == InPreLayout);
@@ -1515 +1516 @@
         ASSERT(m_layoutPhase == InRenderTreeLayout);
 #ifndef NDEBUG
-        RenderTreeNeedsLayoutChecker checker(*root);
+        RenderTreeNeedsLayoutChecker checker(*layoutRoot);
 #endif
-        root->layout();
+        layoutRoot->layout();
 
 #if ENABLE(TEXT_AUTOSIZING)
-        applyTextSizingIfNeeded(*root);
+        applyTextSizingIfNeeded(*layoutRoot);
 #endif
 
         ASSERT(m_layoutPhase == InRenderTreeLayout);
-        m_layoutRoot = nullptr;
+        m_subtreeLayoutRoot = nullptr;
         // Close block here to end the scope of changeSchedulingEnabled and SubtreeLayoutStateMaintainer.
     }
@@ -1532 +1533 @@
     bool neededFullRepaint = m_needsFullRepaint;
 
-    if (!subtree && !downcast<RenderView>(*root).printing()) {
+    if (!isSubtreeLayout && !downcast<RenderView>(*layoutRoot).printing()) {
         adjustViewSize();
         // FIXME: Firing media query callbacks synchronously on nested frames could produced a detached FrameView here by
@@ -1546 +1547 @@
     // Now update the positions of all layers.
     if (m_needsFullRepaint)
-        root->view().repaintRootContents();
-
-    root->view().releaseProtectedRenderWidgets();
-
-    ASSERT(!root->needsLayout());
-
-    layer->updateLayerPositionsAfterLayout(renderView()->layer(), updateLayerPositionFlags(layer, subtree, m_needsFullRepaint));
+        layoutRoot->view().repaintRootContents();
+
+    layoutRoot->view().releaseProtectedRenderWidgets();
+
+    ASSERT(!layoutRoot->needsLayout());
+
+    layer->updateLayerPositionsAfterLayout(renderView()->layer(), updateLayerPositionFlags(layer, isSubtreeLayout, m_needsFullRepaint));
 
     updateCompositingLayersAfterLayout();
@@ -1561 +1562 @@
 
 #if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK)
-    if (AXObjectCache* cache = root->document().existingAXObjectCache())
-        cache->postNotification(root, AXObjectCache::AXLayoutComplete);
+    if (AXObjectCache* cache = layoutRoot->document().existingAXObjectCache())
+        cache->postNotification(layoutRoot, AXObjectCache::AXLayoutComplete);
 #endif
 
@@ -1605 +1606 @@
     }
 
-    InspectorInstrumentation::didLayout(cookie, *root);
+    InspectorInstrumentation::didLayout(cookie, *layoutRoot);
     DebugPageOverlays::didLayout(frame());
 
@@ -3040 +3041 @@
 void FrameView::convertSubtreeLayoutToFullLayout()
 {
-    ASSERT(m_layoutRoot);
-    m_layoutRoot->markContainingBlocksForLayout(ScheduleRelayout::No);
-    m_layoutRoot = nullptr;
+    ASSERT(m_subtreeLayoutRoot);
+    m_subtreeLayoutRoot->markContainingBlocksForLayout(ScheduleRelayout::No);
+    m_subtreeLayoutRoot = nullptr;
 }
 
@@ -3060 +3061 @@
     ASSERT(frame().view() == this);
 
-    if (m_layoutRoot)
+    if (m_subtreeLayoutRoot)
         convertSubtreeLayoutToFullLayout();
     if (!m_layoutSchedulingEnabled)
@@ -3109 +3110 @@
     ASSERT(frame().view() == this);
 
-    // When m_layoutRoot is already set, ignore the renderView's needsLayout bit
-    // since we need to resolve the conflict between the m_layoutRoot and newRelayoutRoot layouts.
-    if (renderView.needsLayout() && !m_layoutRoot) {
-        m_layoutRoot = &newRelayoutRoot;
+    // When m_subtreeLayoutRoot is already set, ignore the renderView's needsLayout bit
+    // since we need to resolve the conflict between the m_subtreeLayoutRoot and newRelayoutRoot layouts.
+    if (renderView.needsLayout() && !m_subtreeLayoutRoot) {
+        m_subtreeLayoutRoot = &newRelayoutRoot;
         convertSubtreeLayoutToFullLayout();
         return;
@@ -3120 +3121 @@
         Seconds delay = renderView.document().minimumLayoutDelay();
         ASSERT(!newRelayoutRoot.container() || is<RenderView>(newRelayoutRoot.container()) || !newRelayoutRoot.container()->needsLayout());
-        m_layoutRoot = &newRelayoutRoot;
+        m_subtreeLayoutRoot = &newRelayoutRoot;
         InspectorInstrumentation::didInvalidateLayout(frame());
         m_delayedLayout = delay.value();
@@ -3127 +3128 @@
     }
 
-    if (m_layoutRoot == &newRelayoutRoot)
-        return;
-
-    if (!m_layoutRoot) {
+    if (m_subtreeLayoutRoot == &newRelayoutRoot)
+        return;
+
+    if (!m_subtreeLayoutRoot) {
         // We already have a pending (full) layout. Just mark the subtree for layout.
         newRelayoutRoot.markContainingBlocksForLayout(ScheduleRelayout::No);
@@ -3137 +3138 @@
     }
 
-    if (isObjectAncestorContainerOf(m_layoutRoot, &newRelayoutRoot)) {
+    if (isObjectAncestorContainerOf(m_subtreeLayoutRoot, &newRelayoutRoot)) {
         // Keep the current root.
-        newRelayoutRoot.markContainingBlocksForLayout(ScheduleRelayout::No, m_layoutRoot);
-        ASSERT(!m_layoutRoot->container() || is<RenderView>(m_layoutRoot->container()) || !m_layoutRoot->container()->needsLayout());
-        return;
-    }
-
-    if (isObjectAncestorContainerOf(&newRelayoutRoot, m_layoutRoot)) {
+        newRelayoutRoot.markContainingBlocksForLayout(ScheduleRelayout::No, m_subtreeLayoutRoot);
+        ASSERT(!m_subtreeLayoutRoot->container() || is<RenderView>(m_subtreeLayoutRoot->container()) || !m_subtreeLayoutRoot->container()->needsLayout());
+        return;
+    }
+
+    if (isObjectAncestorContainerOf(&newRelayoutRoot, m_subtreeLayoutRoot)) {
         // Re-root at newRelayoutRoot.
-        m_layoutRoot->markContainingBlocksForLayout(ScheduleRelayout::No, &newRelayoutRoot);
-        m_layoutRoot = &newRelayoutRoot;
-        ASSERT(!m_layoutRoot->container() || is<RenderView>(m_layoutRoot->container()) || !m_layoutRoot->container()->needsLayout());
+        m_subtreeLayoutRoot->markContainingBlocksForLayout(ScheduleRelayout::No, &newRelayoutRoot);
+        m_subtreeLayoutRoot = &newRelayoutRoot;
+        ASSERT(!m_subtreeLayoutRoot->container() || is<RenderView>(m_subtreeLayoutRoot->container()) || !m_subtreeLayoutRoot->container()->needsLayout());
         InspectorInstrumentation::didInvalidateLayout(frame());
         return;
@@ -3171 +3172 @@
     return layoutPending()
         || (renderView && renderView->needsLayout())
-        || m_layoutRoot
+        || m_subtreeLayoutRoot
         || (m_deferSetNeedsLayoutCount && m_setNeedsLayoutWasDeferred);
 }
@@ -3689 +3690 @@
     LOG(Layout, "FrameView %p autoSizeIfEnabled", this);
     SetForScope<bool> changeInAutoSize(m_inAutoSize, true);
-    if (m_layoutRoot)
+    if (m_subtreeLayoutRoot)
         convertSubtreeLayoutToFullLayout();
     // Start from the minimum size and allow it to grow.

trunk/Source/WebCore/page/FrameView.h

@@ -117 +117 @@
     bool inPaintableState() { return m_layoutPhase != InRenderTreeLayout && m_layoutPhase != InViewSizeAdjust && m_layoutPhase != InPostLayout; }
 
-    RenderElement* layoutRoot() const { return m_layoutRoot; }
-    void clearLayoutRoot() { m_layoutRoot = nullptr; }
+    RenderElement* subtreeLayoutRoot() const { return m_subtreeLayoutRoot; }
+    void clearSubtreeLayoutRoot() { m_subtreeLayoutRoot = nullptr; }
     int layoutCount() const { return m_layoutCount; }
 
@@ -800 +800 @@
     Timer m_layoutTimer;
     bool m_delayedLayout;
-    RenderElement* m_layoutRoot { nullptr };
+    RenderElement* m_subtreeLayoutRoot { nullptr };
 
     LayoutPhase m_layoutPhase;

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2297 +2297 @@
 
     // If layout is limited to a subtree, the subtree root's logical width does not change.
-    if (element() && !view().frameView().layoutPending() && view().frameView().layoutRoot() == this)
+    if (element() && !view().frameView().layoutPending() && view().frameView().subtreeLayoutRoot() == this)
         return;
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -1097 +1097 @@
 }
 
-inline void RenderElement::clearLayoutRootIfNeeded() const
+inline void RenderElement::clearSubtreeLayoutRootIfNeeded() const
 {
     if (renderTreeBeingDestroyed())
         return;
 
-    if (view().frameView().layoutRoot() != this)
+    if (view().frameView().subtreeLayoutRoot() != this)
         return;
 
@@ -1112 +1112 @@
     // the layout root is still set to |this|. Make sure to clear it
     // since we are getting destroyed.
-    view().frameView().clearLayoutRoot();
+    view().frameView().clearSubtreeLayoutRoot();
 }
 
@@ -1129 +1129 @@
     RenderObject::willBeDestroyed();
 
-    clearLayoutRootIfNeeded();
+    clearSubtreeLayoutRootIfNeeded();
 
     if (hasInitializedStyle()) {

trunk/Source/WebCore/rendering/RenderElement.h

@@ -324 +324 @@
     bool getTrailingCorner(FloatPoint& output, bool& insideFixed) const;
 
-    void clearLayoutRootIfNeeded() const;
+    void clearSubtreeLayoutRootIfNeeded() const;
     
     bool shouldWillChangeCreateStackingContext() const;