Changeset 251638 in webkit

Timestamp:

Oct 26, 2019, 12:16:18 PM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC] Do not layout on every paint frame.
​https://bugs.webkit.org/show_bug.cgi?id=203462
<rdar://problem/56646779>

Reviewed by Antti Koivisto.

This is in preparation for being able to run layout benchmarks.

• layout/LayoutContext.cpp:

(WebCore::Layout::LayoutContext::runLayoutAndVerify):
(WebCore::Layout::LayoutContext::paint):
(WebCore::Layout::LayoutContext::runLayoutAndPaint): Deleted.

• layout/LayoutContext.h:
• layout/LayoutState.cpp:

(WebCore::Layout::LayoutState::LayoutState):

• layout/LayoutState.h:
• layout/layouttree/LayoutTreeBuilder.cpp:

(WebCore::Layout::printLayoutTreeForLiveDocuments):

• page/FrameView.cpp:

(WebCore::FrameView::paintContents):

• page/FrameViewLayoutContext.cpp:

(WebCore::FrameViewLayoutContext::layoutUsingFormattingContext):
(WebCore::FrameViewLayoutContext::layout):
(WebCore::layoutUsingFormattingContext): Deleted.

• page/FrameViewLayoutContext.h:

(WebCore::FrameViewLayoutContext::initialLayoutState const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/LayoutContext.cpp (modified) (1 diff)
• layout/LayoutContext.h (modified) (1 diff)
• layout/LayoutState.cpp (modified) (1 diff)
• layout/LayoutState.h (modified) (4 diffs)
• layout/layouttree/LayoutTreeBuilder.cpp (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• page/FrameViewLayoutContext.cpp (modified) (3 diffs)
• page/FrameViewLayoutContext.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-26  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Do not layout on every paint frame.
+        https://bugs.webkit.org/show_bug.cgi?id=203462
+        <rdar://problem/56646779>
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for being able to run layout benchmarks.
+
+        * layout/LayoutContext.cpp:
+        (WebCore::Layout::LayoutContext::runLayoutAndVerify):
+        (WebCore::Layout::LayoutContext::paint):
+        (WebCore::Layout::LayoutContext::runLayoutAndPaint): Deleted.
+        * layout/LayoutContext.h:
+        * layout/LayoutState.cpp:
+        (WebCore::Layout::LayoutState::LayoutState):
+        * layout/LayoutState.h:
+        * layout/layouttree/LayoutTreeBuilder.cpp:
+        (WebCore::Layout::printLayoutTreeForLiveDocuments):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::paintContents):
+        * page/FrameViewLayoutContext.cpp:
+        (WebCore::FrameViewLayoutContext::layoutUsingFormattingContext):
+        (WebCore::FrameViewLayoutContext::layout):
+        (WebCore::layoutUsingFormattingContext): Deleted.
+        * page/FrameViewLayoutContext.h:
+        (WebCore::FrameViewLayoutContext::initialLayoutState const):
+
 2019-10-26  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/layout/LayoutContext.cpp

@@ -162 +162 @@
 }
 
-void LayoutContext::runLayoutAndVerify(const RenderView& renderView)
+std::unique_ptr<LayoutState> LayoutContext::runLayoutAndVerify(const RenderView& renderView)
 {
-    auto initialContainingBlock = TreeBuilder::createLayoutTree(renderView);
-    auto layoutState = LayoutState { *initialContainingBlock };
-    initializeLayoutState(layoutState, renderView);
-    runLayout(layoutState);
-    LayoutContext::verifyAndOutputMismatchingLayoutTree(layoutState, renderView);
+    auto layoutState = makeUnique<LayoutState>(TreeBuilder::createLayoutTree(renderView));
+    initializeLayoutState(*layoutState, renderView);
+    runLayout(*layoutState);
+    LayoutContext::verifyAndOutputMismatchingLayoutTree(*layoutState, renderView);
+    return layoutState;
 }
 
-void LayoutContext::runLayoutAndPaint(const RenderView& renderView, GraphicsContext& context)
+void LayoutContext::paint(const LayoutState& layoutState, GraphicsContext& context)
 {
-    auto initialContainingBlock = TreeBuilder::createLayoutTree(renderView);
-    auto layoutState = LayoutState { *initialContainingBlock };
-    initializeLayoutState(layoutState, renderView);
-    runLayout(layoutState);
     Display::Painter::paint(layoutState, context);
 }

trunk/Source/WebCore/layout/LayoutContext.h

@@ -55 +55 @@
 public:
     // FIXME: These are temporary entry points for LFC layout.
-    static void runLayoutAndVerify(const RenderView&);
-    static void runLayoutAndPaint(const RenderView&, GraphicsContext&);
+    static std::unique_ptr<LayoutState> runLayoutAndVerify(const RenderView&);
+    static void paint(const LayoutState&, GraphicsContext&);
 
     LayoutContext(LayoutState&);

trunk/Source/WebCore/layout/LayoutState.cpp

@@ -39 +39 @@
 WTF_MAKE_ISO_ALLOCATED_IMPL(LayoutState);
 
-LayoutState::LayoutState(const Container& root)
-    : m_root(makeWeakPtr(root))
+LayoutState::LayoutState(std::unique_ptr<Container> root)
+    : m_root(WTFMove(root))
 {
     // It makes absolutely no sense to construct a dedicated layout state for a non-formatting context root (it would be a no-op).
-    ASSERT(root.establishesFormattingContext());
+    ASSERT(m_root->establishesFormattingContext());
 }
 

trunk/Source/WebCore/layout/LayoutState.h

@@ -28 +28 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
+#include "LayoutContainer.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
@@ -42 +43 @@
 
 class Box;
-class Container;
 class FormattingContext;
 class FormattingState;
@@ -49 +49 @@
     WTF_MAKE_ISO_ALLOCATED(LayoutState);
 public:
-    LayoutState(const Container& root);
+    LayoutState(std::unique_ptr<Container> root);
     ~LayoutState();
 
@@ -75 +75 @@
 
 private:
-    WeakPtr<const Container> m_root;
+    // FIXME: Figure out the ownership model for the layout tree.
+    std::unique_ptr<Container> m_root;
     HashMap<const Container*, std::unique_ptr<FormattingState>> m_formattingStates;
 #ifndef NDEBUG

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

@@ -402 +402 @@
         // FIXME: Need to find a way to output geometry without layout context.
         auto& renderView = *document->renderView();
-        auto initialContainingBlock = TreeBuilder::createLayoutTree(renderView);
-        auto layoutState = LayoutState { *initialContainingBlock };
+        auto layoutState = LayoutState { TreeBuilder::createLayoutTree(renderView) };
         layoutState.setQuirksMode(renderView.document().inLimitedQuirksMode() ? LayoutState::QuirksMode::Limited : (renderView.document().inQuirksMode() ? LayoutState::QuirksMode::Yes : LayoutState::QuirksMode::No));
         LayoutContext(layoutState).layout();
-        showLayoutTree(*initialContainingBlock, &layoutState);
+        showLayoutTree(layoutState.root(), &layoutState);
     }
 }

trunk/Source/WebCore/page/FrameView.cpp

@@ -4181 +4181 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
     if (RuntimeEnabledFeatures::sharedFeatures().layoutFormattingContextEnabled()) {
-        Layout::LayoutContext::runLayoutAndPaint(*renderView, context);
+        if (auto* layoutState = layoutContext().initialLayoutState())
+            Layout::LayoutContext::paint(*layoutState, context);
         return;
     }

trunk/Source/WebCore/page/FrameViewLayoutContext.cpp

@@ -42 +42 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 #include "LayoutContext.h"
+#include "LayoutState.h"
 #endif
 
@@ -51 +52 @@
 
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-static void layoutUsingFormattingContext(const RenderView& renderView)
+void FrameViewLayoutContext::layoutUsingFormattingContext()
 {
     if (!RuntimeEnabledFeatures::sharedFeatures().layoutFormattingContextEnabled())
         return;
-    Layout::LayoutContext::runLayoutAndVerify(renderView);
+    m_initialLayoutState = Layout::LayoutContext::runLayoutAndVerify(*renderView());
 } 
 #endif
@@ -205 +206 @@
         layoutRoot->layout();
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-        layoutUsingFormattingContext(*renderView());
+        layoutUsingFormattingContext();
 #endif
         ++m_layoutCount;

trunk/Source/WebCore/page/FrameViewLayoutContext.h

@@ -43 +43 @@
 class RenderLayoutState;
 class RenderView;
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+namespace Layout {
+class LayoutState;
+}
+#endif
     
 class FrameViewLayoutContext {
@@ -111 +116 @@
     using LayoutStateStack = Vector<std::unique_ptr<RenderLayoutState>>;
 
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+    const Layout::LayoutState* initialLayoutState() const { return m_initialLayoutState.get(); }
+#endif
+
 private:
     friend class LayoutScope;
@@ -151 +160 @@
     void disablePaintOffsetCache() { m_paintOffsetCacheDisableCount++; }
     void enablePaintOffsetCache() { ASSERT(m_paintOffsetCacheDisableCount > 0); m_paintOffsetCacheDisableCount--; }
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+    void layoutUsingFormattingContext();
+#endif
 
     Frame& frame() const;
@@ -176 +188 @@
     unsigned m_paintOffsetCacheDisableCount { 0 };
     LayoutStateStack m_layoutStateStack;
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+    std::unique_ptr<Layout::LayoutState> m_initialLayoutState;
+#endif
 };