Changeset 251640 in webkit

Timestamp:

Oct 27, 2019, 9:33:01 AM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC][Painting] Use the dirty rect to decide what to paint
​https://bugs.webkit.org/show_bug.cgi?id=203467
<rdar://problem/56653229>

Reviewed by Antti Koivisto.

This is a very basic dirty rect instersect check since we don't yet have layout overflow.
It enables us to not paint the entire content on every paint frame.

• layout/LayoutContext.cpp:

(WebCore::Layout::LayoutContext::paint):

• layout/LayoutContext.h:
• layout/displaytree/DisplayPainter.cpp:

(WebCore::Display::paintBoxDecorationAndChildren):
(WebCore::Display::Painter::paint):

• layout/displaytree/DisplayPainter.h:
• page/FrameView.cpp:

(WebCore::FrameView::paintContents):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/LayoutContext.cpp (modified) (1 diff)
• layout/LayoutContext.h (modified) (2 diffs)
• layout/displaytree/DisplayPainter.cpp (modified) (3 diffs)
• layout/displaytree/DisplayPainter.h (modified) (2 diffs)
• page/FrameView.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-27  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Painting] Use the dirty rect to decide what to paint
+        https://bugs.webkit.org/show_bug.cgi?id=203467
+        <rdar://problem/56653229>
+
+        Reviewed by Antti Koivisto.
+
+        This is a very basic dirty rect instersect check since we don't yet have layout overflow.
+        It enables us to not paint the entire content on every paint frame. 
+
+        * layout/LayoutContext.cpp:
+        (WebCore::Layout::LayoutContext::paint):
+        * layout/LayoutContext.h:
+        * layout/displaytree/DisplayPainter.cpp:
+        (WebCore::Display::paintBoxDecorationAndChildren):
+        (WebCore::Display::Painter::paint):
+        * layout/displaytree/DisplayPainter.h:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::paintContents):
+
 2019-10-26  youenn fablet  <youenn@apple.com>
 

trunk/Source/WebCore/layout/LayoutContext.cpp

@@ -171 +171 @@
 }
 
-void LayoutContext::paint(const LayoutState& layoutState, GraphicsContext& context)
+void LayoutContext::paint(const LayoutState& layoutState, GraphicsContext& context, const IntRect& dirtyRect)
 {
-    Display::Painter::paint(layoutState, context);
+    Display::Painter::paint(layoutState, context, dirtyRect);
 }
 

trunk/Source/WebCore/layout/LayoutContext.h

@@ -35 +35 @@
 
 class GraphicsContext;
+class IntRect;
 class RenderView;
 
@@ -56 +57 @@
     // FIXME: These are temporary entry points for LFC layout.
     static std::unique_ptr<LayoutState> runLayoutAndVerify(const RenderView&);
-    static void paint(const LayoutState&, GraphicsContext&);
+    static void paint(const LayoutState&, GraphicsContext&, const IntRect& dirtyRect);
 
     LayoutContext(LayoutState&);

trunk/Source/WebCore/layout/displaytree/DisplayPainter.cpp

@@ -35 +35 @@
 #include "InlineFormattingState.h"
 #include "InlineTextItem.h"
+#include "IntRect.h"
 #include "LayoutContainer.h"
 #include "LayoutDescendantIterator.h"
@@ -146 +147 @@
 }
 
-static void paintBoxDecorationAndChildren(GraphicsContext& context, const Layout::LayoutState& layoutState, const Layout::Box& layoutBox)
+static void paintBoxDecorationAndChildren(GraphicsContext& context, const Layout::LayoutState& layoutState, const Layout::Box& layoutBox, const IntRect& dirtyRect)
 {
-    if (!layoutBox.isAnonymous())
-        paintBoxDecoration(context, absoluteDisplayBox(layoutState, layoutBox), layoutBox.style(), layoutBox.isBodyBox());
+    if (!layoutBox.isAnonymous()) {
+        auto absoluteDisplayBox = Display::absoluteDisplayBox(layoutState, layoutBox);
+        if (dirtyRect.intersects(snappedIntRect(absoluteDisplayBox.rect())))
+            paintBoxDecoration(context, absoluteDisplayBox, layoutBox.style(), layoutBox.isBodyBox());
+    }
 
     if (!is<Layout::Container>(layoutBox))
@@ -156 +160 @@
         if (childLayoutBox.style().visibility() != Visibility::Visible)
             continue;
-        paintBoxDecorationAndChildren(context, layoutState, childLayoutBox);
+        paintBoxDecorationAndChildren(context, layoutState, childLayoutBox, dirtyRect);
     }
 }
 
-void Painter::paint(const Layout::LayoutState& layoutState, GraphicsContext& context)
+void Painter::paint(const Layout::LayoutState& layoutState, GraphicsContext& context, const IntRect& dirtyRect)
 {
     auto& layoutRoot = layoutState.root();
-    auto& rootDisplayBox = layoutState.displayBoxForLayoutBox(layoutRoot);
-    context.fillRect({ FloatPoint { }, FloatSize { rootDisplayBox.borderBoxWidth(), rootDisplayBox.borderBoxHeight() } }, Color::white);
     if (!layoutRoot.firstChild())
         return;
+    // Fill the entire content area.
+    auto rootRect = LayoutRect { layoutState.displayBoxForLayoutBox(layoutRoot).rect() };
+    for (auto& layoutBox : Layout::descendantsOfType<Layout::Box>(layoutRoot))
+        rootRect.uniteIfNonZero(Display::absoluteDisplayBox(layoutState, layoutBox).rect());
+    context.fillRect(rootRect, Color::white);
 
     // 1. Paint box decoration (both block and inline).
-    paintBoxDecorationAndChildren(context, layoutState, *layoutRoot.firstChild());
+    paintBoxDecorationAndChildren(context, layoutState, *layoutRoot.firstChild(), dirtyRect);
 
     // 2. Paint content
     for (auto& layoutBox : Layout::descendantsOfType<Layout::Box>(layoutRoot)) {
+        auto absoluteDisplayBox = Display::absoluteDisplayBox(layoutState, layoutBox);
+        // FIXME: This is the best we can do with no layout overflow support.
+        if (!dirtyRect.intersects(snappedIntRect(absoluteDisplayBox.rect())))
+            continue;
         if (layoutBox.style().visibility() != Visibility::Visible)
             continue;
         if (layoutBox.establishesInlineFormattingContext()) {
             auto& container = downcast<Layout::Container>(layoutBox);
-            paintInlineContent(context, absoluteDisplayBox(layoutState, container), downcast<Layout::InlineFormattingState>(layoutState.establishedFormattingState(container)));
+            paintInlineContent(context, absoluteDisplayBox, downcast<Layout::InlineFormattingState>(layoutState.establishedFormattingState(container)));
             continue;
         }

trunk/Source/WebCore/layout/displaytree/DisplayPainter.h

@@ -31 +31 @@
 
 class GraphicsContext;
+class IntRect;
 
 namespace Layout {
@@ -40 +41 @@
 class Painter {
 public:
-    static void paint(const Layout::LayoutState&, GraphicsContext&);
+    static void paint(const Layout::LayoutState&, GraphicsContext&, const IntRect& dirtyRect);
 };
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -4182 +4182 @@
     if (RuntimeEnabledFeatures::sharedFeatures().layoutFormattingContextEnabled()) {
         if (auto* layoutState = layoutContext().initialLayoutState())
-            Layout::LayoutContext::paint(*layoutState, context);
+            Layout::LayoutContext::paint(*layoutState, context, dirtyRect);
         return;
     }