Changeset 252912 in webkit

Timestamp:

Nov 27, 2019 1:41:57 PM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC] Run layout on the root when InvalidationState is empty.
​https://bugs.webkit.org/show_bug.cgi?id=204651
<rdar://problem/57509616>

Reviewed by Antti Koivisto.

InvalidationState captures style/tree mutation related changes. An empty InvalidationState indicates that the horizontal constraint changed
and we need to initiate a layout on the ICB (and the layout logic will propagate the damage down on the tree).

• layout/LayoutContext.cpp:

(WebCore::Layout::LayoutContext::layout):

• layout/RenderBlockFlowLineLayout.cpp:

(WebCore::Layout::RenderBlockFlowLineLayout::layout):

• layout/layouttree/LayoutTreeBuilder.cpp:

(WebCore::Layout::printLayoutTreeForLiveDocuments):

• page/FrameViewLayoutContext.cpp:

(WebCore::FrameViewLayoutContext::layoutUsingFormattingContext):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/LayoutContext.cpp (modified) (2 diffs)
• layout/RenderBlockFlowLineLayout.cpp (modified) (1 diff)
• layout/layouttree/LayoutTreeBuilder.cpp (modified) (1 diff)
• page/FrameViewLayoutContext.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-27  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Run layout on the root when InvalidationState is empty.
+        https://bugs.webkit.org/show_bug.cgi?id=204651
+        <rdar://problem/57509616>
+
+        Reviewed by Antti Koivisto.
+
+        InvalidationState captures style/tree mutation related changes. An empty InvalidationState indicates that the horizontal constraint changed
+        and we need to initiate a layout on the ICB (and the layout logic will propagate the damage down on the tree). 
+
+        * layout/LayoutContext.cpp:
+        (WebCore::Layout::LayoutContext::layout):
+        * layout/RenderBlockFlowLineLayout.cpp:
+        (WebCore::Layout::RenderBlockFlowLineLayout::layout):
+        * layout/layouttree/LayoutTreeBuilder.cpp:
+        (WebCore::Layout::printLayoutTreeForLiveDocuments):
+        * page/FrameViewLayoutContext.cpp:
+        (WebCore::FrameViewLayoutContext::layoutUsingFormattingContext):
+
 2019-11-27  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/layout/LayoutContext.cpp

@@ -60 +60 @@
 {
     PhaseScope scope(Phase::Type::Layout);
-
-    auto& formattingContextRootsForLayout = invalidationState.formattingContextRoots();
-    if (formattingContextRootsForLayout.computesEmpty())
-        return;
-
     // Set the geometry on the root.
     // Note that we never layout the root box. It has to have an already computed geometry (in case of ICB, it's the view geometry).
@@ -78 +73 @@
     displayBox.setContentBoxHeight(rootContentBoxSize.height());
     displayBox.setContentBoxWidth(rootContentBoxSize.width());
+
+    auto& formattingContextRootsForLayout = invalidationState.formattingContextRoots();
+    // When invalidation is empty, we assume constraint mutation and start running layout on the context root. Layout logic should be able to figure out the damage.
+    if (formattingContextRootsForLayout.computesEmpty())
+        return layoutFormattingContextSubtree(m_layoutState.root(), invalidationState);
+
     for (auto& formattingContextRoot : formattingContextRootsForLayout)
         layoutFormattingContextSubtree(formattingContextRoot, invalidationState);

trunk/Source/WebCore/layout/RenderBlockFlowLineLayout.cpp

@@ -75 +75 @@
 
     auto& rootContainer = m_layoutState->root();
-
-    if (!rootContainer.firstChild())
-        return;
-
-    InvalidationState invalidationState;
-    // FIXME: Find some better way to do this.
-    invalidationState.markNeedsUpdate(*rootContainer.firstChild());
-
-    LayoutContext layoutContext(*m_layoutState);
+    auto layoutContext = LayoutContext { *m_layoutState };
+    auto invalidationState = InvalidationState { };
     layoutContext.layout(m_flow.contentSize(), invalidationState);
 

trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp

@@ -451 +451 @@
         auto& layoutRoot = layoutState.root();
         auto invalidationState = InvalidationState { };
-        auto invalidationContext = InvalidationContext { invalidationState };
-        invalidationContext.styleChanged(*layoutRoot.firstChild(), StyleDifference::Layout);
-
         LayoutContext(layoutState).layout(renderView.size(), invalidationState);
         showLayoutTree(layoutRoot, &layoutState);

trunk/Source/WebCore/page/FrameViewLayoutContext.cpp

@@ -62 +62 @@
         return;
 
+    // FrameView::setContentsSize temporary disables layout.
+    if (m_disableSetNeedsLayoutCount)
+        return;
+
     auto& renderView = *this->renderView();
     if (!m_layoutTreeContent) {
@@ -73 +77 @@
     // FIXME: This is not the real invalidation yet.
     auto invalidationState = Layout::InvalidationState { };
-    auto invalidationContext = Layout::InvalidationContext { invalidationState };
-
-    // FrameView::setContentsSize temporary disables layout.
-    if (!m_disableSetNeedsLayoutCount)
-        invalidationContext.styleChanged(*m_layoutState->root().firstChild(), StyleDifference::Layout);
-
     auto layoutContext = Layout::LayoutContext { *m_layoutState };
     layoutContext.layout(view().layoutSize(), invalidationState);