Changeset 252735 in webkit

Timestamp:

Nov 21, 2019 8:32:09 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC] Add support for LFC layout only.
​https://bugs.webkit.org/show_bug.cgi?id=204441
<rdar://problem/57382929>

Reviewed by Antti Koivisto.

Clean up the render tree state when RenderView::layout is not called.

• page/FrameViewLayoutContext.cpp:

(WebCore::FrameViewLayoutContext::layoutUsingFormattingContext):

• rendering/updating/RenderTreeUpdater.cpp:

(WebCore::RenderTreeUpdater::updateRendererStyle):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameViewLayoutContext.cpp (modified) (4 diffs)
• rendering/updating/RenderTreeUpdater.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-21  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Add support for LFC layout only.
+        https://bugs.webkit.org/show_bug.cgi?id=204441
+        <rdar://problem/57382929>
+
+        Reviewed by Antti Koivisto.
+
+        Clean up the render tree state when RenderView::layout is not called.
+
+        * page/FrameViewLayoutContext.cpp:
+        (WebCore::FrameViewLayoutContext::layoutUsingFormattingContext):
+        * rendering/updating/RenderTreeUpdater.cpp:
+        (WebCore::RenderTreeUpdater::updateRendererStyle):
+
 2019-11-21  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/page/FrameViewLayoutContext.cpp

@@ -41 +41 @@
 #include "Settings.h"
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+#include "DisplayBox.h"
 #include "InvalidationContext.h"
 #include "InvalidationState.h"
@@ -46 +47 @@
 #include "LayoutState.h"
 #include "LayoutTreeBuilder.h"
+#include "RenderDescendantIterator.h"
 #endif
 
@@ -60 +62 @@
         return;
 
+    auto& renderView = *this->renderView();
     if (!m_layoutTreeContent) {
-        m_layoutTreeContent = Layout::TreeBuilder::buildLayoutTree(*renderView());
+        m_layoutTreeContent = Layout::TreeBuilder::buildLayoutTree(renderView);
         // FIXME: New layout tree requires a new state for now.
         m_layoutState = nullptr;
@@ -74 +77 @@
 
     auto layoutContext = Layout::LayoutContext { *m_layoutState };
-    layoutContext.layout(renderView()->size(), invalidationState);
+    layoutContext.layout(view().layoutSize(), invalidationState);
+
+    // Clean up the render tree state when we don't run RenderView::layout.
+    if (renderView.needsLayout()) {
+        auto contentSize = m_layoutState->displayBoxForLayoutBox(*m_layoutState->root().firstChild()).size();
+        renderView.setSize(contentSize);
+        renderView.repaintViewRectangle({ 0, 0, contentSize.width(), contentSize.height() });
+
+        for (auto& descendant : descendantsOfType<RenderObject>(renderView))
+            descendant.clearNeedsLayout();
+        renderView.clearNeedsLayout();
+    }
+
 #ifndef NDEBUG
     Layout::LayoutContext::verifyAndOutputMismatchingLayoutTree(*m_layoutState);

trunk/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp

@@ -298 +298 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
     if (RuntimeEnabledFeatures::sharedFeatures().layoutFormattingContextEnabled()) {
-        if (!m_document.view() || !m_document.view()->layoutContext().layoutFormattingState())
+        if (!m_document.view() || !m_document.view()->layoutContext().layoutTreeContent())
             return;
         if (auto* layoutBox = m_document.view()->layoutContext().layoutTreeContent()->layoutBoxForRenderer(renderer))