Add CullRect::ApplyPaintProperties()

It will be called to map a cull rect from parent space to local space
in cull rect update during PrePaint. The purpose is to mark PaintLayers
needing repaint on cull rect changes before paint, instead of checking
interest rect / cull rect changes during paint, to avoid setting
PaintLayer needing repaint unnecessarily, especially for CAP during
composited scrolling.

Besides the original features of CullRect::ApplyTransforms() which is
used in cull rect mapping for CompositeAfterPaint, it also implements
the following features to be on par with CompositedLayerMapping::
ReComputeInterestRect():

- Considering clips in additional to scroll clips,
- Clipping expanded cull rect by scrolling contents rect for composited
  scroll translations,
- Clamping extreme geometry values,
- Adaptive expansion distance for composited transforms.

The next steps are:
1. Add CullRectUpdater which updates cull rects during PrePaint when
   runtime feature CullRectUpdate is enabled.
2. Use the updated cull rect to replace interest rect in pre-CAP and
   cull rect in CAP and pre-CAP, still behind the runtime feature.
3. Enable CullRectUpdate for CAP
4. Enable CullRectUpdate for pre-CAP.
5. Remove old interest rect / cull rect code.

Bug: 1046544
Change-Id: I6e7e9f85bc0b4640e67de1732744e647b6f7e230
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2620090Reviewed-by: Philip Rogers <pdr@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843304}

third_party/blink/renderer/platform/graphics/paint/cull_rect.h

@@ -18,6 +18,7 @@ class AffineTransform;
 class FloatRect;
 class LayoutRect;
 class LayoutUnit;
+class PropertyTreeState;
 class TransformPaintPropertyNode;
 
 class PLATFORM_EXPORT CullRect {
@@ -47,9 +48,9 @@ class PLATFORM_EXPORT CullRect {
   // 1. it's clipped by the container rect,
   // 2. transformed by inverse of the scroll translation,
   // 3. expanded by thousands of pixels for composited scrolling.
-  void ApplyTransform(const TransformPaintPropertyNode& transform) {
-    ApplyTransformInternal(transform);
-  }
+  // 4. clipped by the contents rect.
+  // TODO(wangxianzhu): Remove this function for CullRectUpdate.
+  void ApplyTransform(const TransformPaintPropertyNode&);
 
   // For CompositeAfterPaint only. Applies transforms from |source| (not
   // included) to |destination| (included). For each scroll translation, the
@@ -58,10 +59,21 @@ class PLATFORM_EXPORT CullRect {
   // doesn't cover the whole scrolling contents, and the new cull rect doesn't
   // change enough (by hundreds of pixels) from |old_cull_rect|, the cull rect
   // will be set to |old_cull_rect| to avoid repaint on each composited scroll.
+  // TODO(wangxianzhu): Remove this function for CullRectUpdate.
   void ApplyTransforms(const TransformPaintPropertyNode& source,
                        const TransformPaintPropertyNode& destination,
                        const base::Optional<CullRect>& old_cull_rect);
 
+  // For CullRectUpdate only. Similar to the above but also applies clips and
+  // expands for all directly composited transforms (including scrolling and
+  // non-scrolling ones). |root| is used to calculate the expansion distance in
+  // the local space, to make the expansion distance approximately the same in
+  // the root space.
+  void ApplyPaintProperties(const PropertyTreeState& root,
+                            const PropertyTreeState& source,
+                            const PropertyTreeState& destination,
+                            const base::Optional<CullRect>& old_cull_rect);
+
   const IntRect& Rect() const { return rect_; }
 
   String ToString() const { return rect_.ToString(); }
@@ -82,10 +94,17 @@ class PLATFORM_EXPORT CullRect {
     // doesn't cover the whole scrolling contents.
     kExpandedForPartialScrollingContents,
   };
-  ApplyTransformResult ApplyTransformInternal(
-      const TransformPaintPropertyNode&);
+  ApplyTransformResult ApplyScrollTranslation(
+      const TransformPaintPropertyNode& root_transform,
+      const TransformPaintPropertyNode& scroll_translation);
+
+  void ApplyTransformWithoutExpansion(const TransformPaintPropertyNode&);
+  void ApplyPaintPropertiesWithoutExpansion(
+      const PropertyTreeState& source,
+      const PropertyTreeState& destination);
 
-  bool ChangedEnough(const CullRect& old_cull_rect) const;
+  bool ChangedEnough(const CullRect& old_cull_rect,
+                     const IntSize* bounds) const;
 
   IntRect rect_;
 };

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -653,6 +653,9 @@
       name: "CSSVariables2TransformValues",
       status: "test",
     },
+    {
+      name: "CullRectUpdate",
+    },
     {
       name: "CustomElementDefaultStyle",
       status: "experimental",

third_party/blink/renderer/platform/testing/paint_property_test_helpers.h

@@ -8,6 +8,7 @@
 #include "third_party/blink/renderer/platform/graphics/paint/clip_paint_property_node.h"
 #include "third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h"
 #include "third_party/blink/renderer/platform/graphics/paint/property_tree_state.h"
+#include "third_party/blink/renderer/platform/graphics/paint/ref_counted_property_tree_state.h"
 #include "third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h"
 #include "third_party/blink/renderer/platform/testing/paint_property_test_helpers.h"
 
@@ -23,6 +24,9 @@ inline const ClipPaintPropertyNode& c0() {
 inline const EffectPaintPropertyNode& e0() {
   return EffectPaintPropertyNode::Root();
 }
+inline const ScrollPaintPropertyNode& s0() {
+  return ScrollPaintPropertyNode::Root();
+}
 
 constexpr int c0_id = 1;
 constexpr int e0_id = 1;
@@ -217,6 +221,28 @@ inline scoped_refptr<TransformPaintPropertyNode> CreateScrollTranslation(
   return TransformPaintPropertyNode::Create(parent, std::move(state));
 }
 
+inline scoped_refptr<TransformPaintPropertyNode> CreateScrollTranslation(
+    const TransformPaintPropertyNodeOrAlias& parent,
+    float offset_x,
+    float offset_y,
+    const IntRect& container_rect,
+    const IntSize& contents_size,
+    CompositingReasons compositing_reasons = CompositingReason::kNone) {
+  const auto* parent_scroll_translation = &parent.Unalias();
+  while (!parent_scroll_translation->ScrollNode())
+    parent_scroll_translation = parent_scroll_translation->UnaliasedParent();
+  ScrollPaintPropertyNode::State scroll_state;
+  scroll_state.container_rect = container_rect;
+  scroll_state.contents_size = contents_size;
+  TransformPaintPropertyNode::State translation_state{
+      FloatSize(offset_x, offset_y)};
+  translation_state.direct_compositing_reasons = compositing_reasons;
+  translation_state.scroll = ScrollPaintPropertyNode::Create(
+      *parent_scroll_translation->ScrollNode(), std::move(scroll_state));
+  return TransformPaintPropertyNode::Create(parent,
+                                            std::move(translation_state));
+}
+
 inline scoped_refptr<TransformPaintPropertyNode>
 CreateCompositedScrollTranslation(
     const TransformPaintPropertyNodeOrAlias& parent,
@@ -227,6 +253,46 @@ CreateCompositedScrollTranslation(
                                  CompositingReason::kOverflowScrolling);
 }
 
+inline scoped_refptr<TransformPaintPropertyNode>
+CreateCompositedScrollTranslation(
+    const TransformPaintPropertyNodeOrAlias& parent,
+    float offset_x,
+    float offset_y,
+    const IntRect& container_rect,
+    const IntSize& contents_size) {
+  return CreateScrollTranslation(parent, offset_x, offset_y, container_rect,
+                                 contents_size,
+                                 CompositingReason::kOverflowScrolling);
+}
+
+inline RefCountedPropertyTreeState CreateScrollTranslationState(
+    const PropertyTreeState& parent_state,
+    float offset_x,
+    float offset_y,
+    const IntRect& container_rect,
+    const IntSize& contents_size,
+    CompositingReasons compositing_reasons = CompositingReason::kNone) {
+  return RefCountedPropertyTreeState(PropertyTreeState(
+      *CreateScrollTranslation(parent_state.Transform(), offset_x, offset_y,
+                               container_rect, contents_size,
+                               compositing_reasons),
+      *CreateClip(parent_state.Clip(), parent_state.Transform(),
+                  FloatRoundedRect(container_rect)),
+      e0()));
+}
+
+inline RefCountedPropertyTreeState CreateCompositedScrollTranslationState(
+    const PropertyTreeState& parent_state,
+    float offset_x,
+    float offset_y,
+    const IntRect& container_rect,
+    const IntSize& contents_size,
+    CompositingReasons compositing_reasons = CompositingReason::kNone) {
+  return CreateScrollTranslationState(parent_state, offset_x, offset_y,
+                                      container_rect, contents_size,
+                                      CompositingReason::kOverflowScrolling);
+}
+
 inline PropertyTreeState DefaultPaintChunkProperties() {
   return PropertyTreeState::Root();
 }

third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt

@@ -7,29 +7,11 @@ Layer tree when the fixed elements are out-of-view (should have just a root laye
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF"
     },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV id='fixed1'",
-      "bounds": [10, 10],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 1
-    },
     {
       "name": "VerticalScrollbar",
       "position": [785, 0],
       "bounds": [15, 600]
     }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [100, -100, 0, 1]
-      ]
-    }
   ]
 }
 

third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/layer-creation/fixed-position-out-of-view-expected.txt

@@ -13,20 +13,6 @@
       "backgroundColor": "#C0C0C0",
       "transform": 1
     },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [10, 10],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 2
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [10, 10],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 3
-    },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
       "bounds": [10, 10],
@@ -48,24 +34,6 @@
         [0, 0, 1, 0],
         [8, 1013, 0, 1]
       ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, -100, 0, 1]
-      ]
-    },
-    {
-      "id": 3,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [1000, 0, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt

@@ -29,13 +29,6 @@ Not scaled:
       "backgroundColor": "#C0C0C0",
       "transform": 4
     },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [10, 10],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 5
-    },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
       "bounds": [10, 10],
@@ -59,16 +52,6 @@ Not scaled:
     {
       "id": 2,
       "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, -100, 0, 1]
-      ]
-    },
-    {
-      "id": 3,
-      "parent": 1,
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
@@ -77,7 +60,7 @@ Not scaled:
       ]
     },
     {
-      "id": 4,
+      "id": 3,
       "parent": 1,
       "transform": [
         [1, 0, 0, 0],
@@ -87,7 +70,7 @@ Not scaled:
       ]
     },
     {
-      "id": 5,
+      "id": 4,
       "parent": 1,
       "transform": [
         [1, 0, 0, 0],
@@ -130,13 +113,6 @@ Scale=0.5:
       "backgroundColor": "#C0C0C0",
       "transform": 4
     },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [10, 10],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 5
-    },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
       "bounds": [10, 10],
@@ -160,16 +136,6 @@ Scale=0.5:
     {
       "id": 2,
       "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, -100, 0, 1]
-      ]
-    },
-    {
-      "id": 3,
-      "parent": 1,
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
@@ -178,7 +144,7 @@ Scale=0.5:
       ]
     },
     {
-      "id": 4,
+      "id": 3,
       "parent": 1,
       "transform": [
         [1, 0, 0, 0],
@@ -188,7 +154,7 @@ Scale=0.5:
       ]
     },
     {
-      "id": 5,
+      "id": 4,
       "parent": 1,
       "transform": [
         [1, 0, 0, 0],
@@ -231,13 +197,6 @@ Scale=1.5:
       "backgroundColor": "#C0C0C0",
       "transform": 4
     },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [10, 10],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 5
-    },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
       "bounds": [10, 10],
@@ -261,16 +220,6 @@ Scale=1.5:
     {
       "id": 2,
       "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, -100, 0, 1]
-      ]
-    },
-    {
-      "id": 3,
-      "parent": 1,
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],
@@ -279,7 +228,7 @@ Scale=1.5:
       ]
     },
     {
-      "id": 4,
+      "id": 3,
       "parent": 1,
       "transform": [
         [1, 0, 0, 0],
@@ -289,7 +238,7 @@ Scale=1.5:
       ]
     },
     {
-      "id": 5,
+      "id": 4,
       "parent": 1,
       "transform": [
         [1, 0, 0, 0],

third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/layer-creation/fixed-position-out-of-view-with-backdrop-filter-expected.txt

@@ -11,16 +11,6 @@
       "bounds": [10, 10],
       "transform": 1
     },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [10, 10],
-      "transform": 2
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
-      "bounds": [10, 10],
-      "transform": 3
-    },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV class='fixed'",
       "bounds": [10, 10]
@@ -40,24 +30,6 @@
         [0, 0, 1, 0],
         [8, 1013, 0, 1]
       ]
-    },
-    {
-      "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, -100, 0, 1]
-      ]
-    },
-    {
-      "id": 3,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [1000, 0, 0, 1]
-      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/scroll-fixed-layer-out-of-view-expected.txt

@@ -7,19 +7,12 @@
       "backgroundColor": "#FFFFFF",
       "transform": 1
     },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV",
-      "bounds": [88, 88],
-      "contentsOpaque": true,
-      "backgroundColor": "#C0C0C0",
-      "transform": 2
-    },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV",
       "bounds": [99, 99],
       "contentsOpaque": true,
       "backgroundColor": "#C0C0C0",
-      "transform": 3
+      "transform": 2
     },
     {
       "name": "VerticalScrollbar",
@@ -39,15 +32,6 @@
     },
     {
       "id": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [100, -300, 0, 1]
-      ]
-    },
-    {
-      "id": 3,
       "transform": [
         [1, 0, 0, 0],
         [0, 1, 0, 0],

third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt

@@ -6,8 +6,9 @@
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "invalidations": [
-        [0, 0, 668, 236],
+        [450, 0, 218, 236],
         [704, 0, 214, 232],
+        [0, 0, 214, 232],
         [700, 217, 4, 19]
       ]
     },