Early-out from the prepaint tree walk

third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/PaintPropertyTreeBuilder.h"
 
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutInline.h"
@@ skipping 16 matching lines @@
       context.fixedPosition.clip = ClipPaintPropertyNode::root();
   context.currentEffect = EffectPaintPropertyNode::root();
   context.inputClipOfCurrentEffect = ClipPaintPropertyNode::root();
   context.current.transform = context.absolutePosition.transform =
       context.fixedPosition.transform = TransformPaintPropertyNode::root();
   context.current.scroll = context.absolutePosition.scroll =
       context.fixedPosition.scroll = ScrollPaintPropertyNode::root();
   return context;
 }
 
-void updateFrameViewPreTranslation(
+PropertyWasCreated updatePreTranslation(
     FrameView& frameView,
     PassRefPtr<const TransformPaintPropertyNode> parent,
     const TransformationMatrix& matrix,
     const FloatPoint3D& origin) {
   DCHECK(!RuntimeEnabledFeatures::rootLayerScrollingEnabled());
   if (auto* existingPreTranslation = frameView.preTranslation()) {
     existingPreTranslation->update(std::move(parent), matrix, origin);
-  } else {
-    frameView.setPreTranslation(
-        TransformPaintPropertyNode::create(std::move(parent), matrix, origin));
+    return DidNotCreateProperty;
   }
+  frameView.setPreTranslation(
+      TransformPaintPropertyNode::create(std::move(parent), matrix, origin));
+  return CreatedProperty;
 }
 
-void updateFrameViewContentClip(
+PropertyWasCreated updateContentClip(
     FrameView& frameView,
     PassRefPtr<const ClipPaintPropertyNode> parent,
     PassRefPtr<const TransformPaintPropertyNode> localTransformSpace,
     const FloatRoundedRect& clipRect) {
   DCHECK(!RuntimeEnabledFeatures::rootLayerScrollingEnabled());
   if (auto* existingContentClip = frameView.contentClip()) {
     existingContentClip->update(std::move(parent),
                                 std::move(localTransformSpace), clipRect);
-  } else {
-    frameView.setContentClip(ClipPaintPropertyNode::create(
-        std::move(parent), std::move(localTransformSpace), clipRect));
+    return DidNotCreateProperty;
   }
+  frameView.setContentClip(ClipPaintPropertyNode::create(
+      std::move(parent), std::move(localTransformSpace), clipRect));
+  return CreatedProperty;
 }
 
-void updateFrameViewScrollTranslation(
+PropertyWasCreated updateScrollTranslation(
     FrameView& frameView,
     PassRefPtr<const TransformPaintPropertyNode> parent,
     const TransformationMatrix& matrix,
     const FloatPoint3D& origin) {
   DCHECK(!RuntimeEnabledFeatures::rootLayerScrollingEnabled());
   if (auto* existingScrollTranslation = frameView.scrollTranslation()) {
     existingScrollTranslation->update(std::move(parent), matrix, origin);
-  } else {
-    frameView.setScrollTranslation(
-        TransformPaintPropertyNode::create(std::move(parent), matrix, origin));
+    return DidNotCreateProperty;
   }
+  frameView.setScrollTranslation(
+      TransformPaintPropertyNode::create(std::move(parent), matrix, origin));
+  return CreatedProperty;
 }
 
-void updateFrameViewScroll(
+PropertyWasCreated updateScroll(
     FrameView& frameView,
     PassRefPtr<const ScrollPaintPropertyNode> parent,
     PassRefPtr<const TransformPaintPropertyNode> scrollOffset,
     const IntSize& clip,
     const IntSize& bounds,
     bool userScrollableHorizontal,
     bool userScrollableVertical,
     MainThreadScrollingReasons mainThreadScrollingReasons) {
   DCHECK(!RuntimeEnabledFeatures::rootLayerScrollingEnabled());
   if (auto* existingScroll = frameView.scroll()) {
     existingScroll->update(std::move(parent), std::move(scrollOffset), clip,
                            bounds, userScrollableHorizontal,
                            userScrollableVertical, mainThreadScrollingReasons);
-  } else {
-    frameView.setScroll(ScrollPaintPropertyNode::create(
-        std::move(parent), std::move(scrollOffset), clip, bounds,
-        userScrollableHorizontal, userScrollableVertical,
-        mainThreadScrollingReasons));
+    return DidNotCreateProperty;
   }
+  frameView.setScroll(ScrollPaintPropertyNode::create(
+      std::move(parent), std::move(scrollOffset), clip, bounds,
+      userScrollableHorizontal, userScrollableVertical,
+      mainThreadScrollingReasons));
+  return CreatedProperty;
 }
 
 void PaintPropertyTreeBuilder::updateProperties(
     FrameView& frameView,
     PaintPropertyTreeBuilderContext& context) {
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     // With root layer scrolling, the LayoutView (a LayoutObject) properties are
     // updated like other objects (see updatePropertiesAndContextForSelf and
     // updatePropertiesAndContextForChildren) instead of needing LayoutView-
     // specific property updates here.
     context.current.paintOffset.moveBy(frameView.location());
     context.current.renderingContextID = 0;
     context.current.shouldFlattenInheritedTransform = true;
     context.absolutePosition = context.current;
     context.containerForAbsolutePosition = nullptr;
     context.fixedPosition = context.current;
     return;
   }
 
+  if (context.forceSubtreeUpdate)
+    frameView.setNeedsPaintPropertyUpdateWithoutMarkingAncestors();
+
 #if DCHECK_IS_ON()
-  FindFrameViewPropertiesNeedingUpdateScope checkNeedsUpdateScope(&frameView);
+  FindFrameViewPropertiesNeedingUpdateScope checkScope(&frameView, context);
 #endif
 
   if (frameView.needsPaintPropertyUpdate()) {
     TransformationMatrix frameTranslate;
     frameTranslate.translate(frameView.x() + context.current.paintOffset.x(),
                              frameView.y() + context.current.paintOffset.y());
-    updateFrameViewPreTranslation(frameView, context.current.transform,
-                                  frameTranslate, FloatPoint3D());
+    context.forceSubtreeUpdate |= updatePreTranslation(

[chrishtr, 2016/12/01 02:36:35]

Did you consider passing context.forceSubtreeUpdate as a bool& parameter to each
of these setters or clearers?

+        frameView, context.current.transform, frameTranslate, FloatPoint3D());
 
     FloatRoundedRect contentClip(
         IntRect(IntPoint(), frameView.visibleContentSize()));
-    updateFrameViewContentClip(frameView, context.current.clip,
-                               frameView.preTranslation(), contentClip);
+    context.forceSubtreeUpdate |=
+        updateContentClip(frameView, context.current.clip,
+                          frameView.preTranslation(), contentClip);
 
     ScrollOffset scrollOffset = frameView.scrollOffset();
     if (frameView.isScrollable() || !scrollOffset.isZero()) {
       TransformationMatrix frameScroll;
       frameScroll.translate(-scrollOffset.width(), -scrollOffset.height());
-      updateFrameViewScrollTranslation(frameView, frameView.preTranslation(),
-                                       frameScroll, FloatPoint3D());
+      context.forceSubtreeUpdate |= updateScrollTranslation(
+          frameView, frameView.preTranslation(), frameScroll, FloatPoint3D());
 
       IntSize scrollClip = frameView.visibleContentSize();
       IntSize scrollBounds = frameView.contentsSize();
       bool userScrollableHorizontal =
           frameView.userInputScrollable(HorizontalScrollbar);
       bool userScrollableVertical =
           frameView.userInputScrollable(VerticalScrollbar);
 
       MainThreadScrollingReasons reasons = 0;
       if (!frameView.frame().settings()->threadedScrollingEnabled())
         reasons |= MainThreadScrollingReason::kThreadedScrollingDisabled;
       if (frameView.hasBackgroundAttachmentFixedObjects()) {
         reasons |=
             MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects;
       }
-      updateFrameViewScroll(frameView, context.current.scroll,
-                            frameView.scrollTranslation(), scrollClip,
-                            scrollBounds, userScrollableHorizontal,
-                            userScrollableVertical, reasons);
+      context.forceSubtreeUpdate |= updateScroll(
+          frameView, context.current.scroll, frameView.scrollTranslation(),
+          scrollClip, scrollBounds, userScrollableHorizontal,
+          userScrollableVertical, reasons);
     } else {
-      // Ensure pre-existing properties are cleared when there is no scrolling.
-      frameView.setScrollTranslation(nullptr);
-      frameView.setScroll(nullptr);
+      if (frameView.scrollTranslation() || frameView.scroll()) {
+        // Ensure pre-existing properties are cleared if there is no scrolling.
+        frameView.setScrollTranslation(nullptr);
+        frameView.setScroll(nullptr);
+
+        // Rebuild all descendant properties because a property was removed.
+        context.forceSubtreeUpdate = true;
+      }
     }
   }
 
   // Initialize the context for current, absolute and fixed position cases.
   // They are the same, except that scroll translation does not apply to
   // fixed position descendants.
   const auto* fixedTransformNode = frameView.preTranslation()
                                        ? frameView.preTranslation()
                                        : context.current.transform;
   auto* fixedScrollNode = context.current.scroll;
@@ skipping 43 matching lines @@
   // component for the transformed content to paint with.  In spv1 this was
   // called "subpixel accumulation". For more information, see
   // PaintLayer::subpixelAccumulation() and
   // PaintLayerPainter::paintFragmentByApplyingTransform.
   IntPoint roundedPaintOffset = roundedIntPoint(context.current.paintOffset);
   LayoutPoint fractionalPaintOffset =
       LayoutPoint(context.current.paintOffset - roundedPaintOffset);
 
   if (object.needsPaintPropertyUpdate()) {
     if (usesPaintOffsetTranslation) {
-      object.getMutableForPainting()
-          .ensurePaintProperties()
-          .updatePaintOffsetTranslation(
-              context.current.transform,
-              TransformationMatrix().translate(roundedPaintOffset.x(),
-                                               roundedPaintOffset.y()),
-              FloatPoint3D(), context.current.shouldFlattenInheritedTransform,
-              context.current.renderingContextID);
+      auto& properties = object.getMutableForPainting().ensurePaintProperties();
+      context.forceSubtreeUpdate |= properties.updatePaintOffsetTranslation(
+          context.current.transform,
+          TransformationMatrix().translate(roundedPaintOffset.x(),
+                                           roundedPaintOffset.y()),
+          FloatPoint3D(), context.current.shouldFlattenInheritedTransform,
+          context.current.renderingContextID);
     } else {
       if (auto* properties = object.getMutableForPainting().paintProperties())
-        properties->clearPaintOffsetTranslation();
+        context.forceSubtreeUpdate |= properties->clearPaintOffsetTranslation();
     }
   }
 
   const auto* properties = object.paintProperties();
   if (properties && properties->paintOffsetTranslation()) {
     context.current.transform = properties->paintOffsetTranslation();
     context.current.paintOffset = fractionalPaintOffset;
     if (RuntimeEnabledFeatures::rootLayerScrollingEnabled() &&
         object.isLayoutView()) {
       context.absolutePosition.transform = properties->paintOffsetTranslation();
@@ skipping 28 matching lines @@
     // transform function.
     const AffineTransform& transform = object.isSVGForeignObject()
                                            ? object.localSVGTransform()
                                            : object.localToSVGParentTransform();
     // TODO(pdr): Check for the presence of a transform instead of the value.
     // Checking for an identity matrix will cause the property tree structure
     // to change during animations if the animation passes through the
     // identity matrix.
     if (!transform.isIdentity()) {
       // The origin is included in the local transform, so leave origin empty.
-      object.getMutableForPainting().ensurePaintProperties().updateTransform(
+      auto& properties = object.getMutableForPainting().ensurePaintProperties();
+      context.forceSubtreeUpdate |= properties.updateTransform(
           context.current.transform, TransformationMatrix(transform),
           FloatPoint3D());
     } else {
       if (auto* properties = object.getMutableForPainting().paintProperties())
-        properties->clearTransform();
+        context.forceSubtreeUpdate |= properties->clearTransform();
     }
   }
 
   if (object.paintProperties() && object.paintProperties()->transform()) {
     context.current.transform = object.paintProperties()->transform();
     context.current.shouldFlattenInheritedTransform = false;
     context.current.renderingContextID = 0;
   }
 }
 
@@ skipping 16 matching lines @@
           ComputedStyle::IncludeIndependentTransformProperties);
 
       // TODO(trchen): transform-style should only be respected if a PaintLayer
       // is created.
       // If a node with transform-style: preserve-3d does not exist in an
       // existing rendering context, it establishes a new one.
       unsigned renderingContextID = context.current.renderingContextID;
       if (style.preserves3D() && !renderingContextID)
         renderingContextID = PtrHash<const LayoutObject>::hash(&object);
 
-      object.getMutableForPainting().ensurePaintProperties().updateTransform(
+      auto& properties = object.getMutableForPainting().ensurePaintProperties();
+      context.forceSubtreeUpdate |= properties.updateTransform(
           context.current.transform, matrix,
           transformOrigin(toLayoutBox(object)),
           context.current.shouldFlattenInheritedTransform, renderingContextID);
     } else {
       if (auto* properties = object.getMutableForPainting().paintProperties())
-        properties->clearTransform();
+        context.forceSubtreeUpdate |= properties->clearTransform();
     }
   }
 
   const auto* properties = object.paintProperties();
   if (properties && properties->transform()) {
     context.current.transform = properties->transform();
     if (object.styleRef().preserves3D()) {
       context.current.renderingContextID =
           properties->transform()->renderingContextID();
       context.current.shouldFlattenInheritedTransform = false;
     } else {
       context.current.renderingContextID = 0;
       context.current.shouldFlattenInheritedTransform = true;
     }
   }
 }
 
 void PaintPropertyTreeBuilder::updateEffect(
     const LayoutObject& object,
     PaintPropertyTreeBuilderContext& context) {
   const ComputedStyle& style = object.styleRef();
 
   if (!style.isStackingContext()) {
     if (object.needsPaintPropertyUpdate()) {
       if (auto* properties = object.getMutableForPainting().paintProperties())
-        properties->clearEffect();
+        context.forceSubtreeUpdate |= properties->clearEffect();
     }
     return;
   }
 
   // TODO(trchen): Can't omit effect node if we have 3D children.
   // TODO(trchen): Can't omit effect node if we have blending children.
   if (object.needsPaintPropertyUpdate()) {
     bool effectNodeNeeded = false;
 
     float opacity = style.opacity();
@@ skipping 30 matching lines @@
     if (!filter.isEmpty()) {
       effectNodeNeeded = true;
       outputClip = context.current.clip;
 
       // TODO(trchen): A filter may contain spatial operations such that an
       // output pixel may depend on an input pixel outside of the output clip.
       // We should generate a special clip node to represent this expansion.
     }
 
     if (effectNodeNeeded) {
-      object.getMutableForPainting().ensurePaintProperties().updateEffect(
+      auto& properties = object.getMutableForPainting().ensurePaintProperties();
+      context.forceSubtreeUpdate |= properties.updateEffect(
           context.currentEffect, context.current.transform, outputClip,
           std::move(filter), opacity);
     } else {
       if (auto* properties = object.getMutableForPainting().paintProperties())
-        properties->clearEffect();
+        context.forceSubtreeUpdate |= properties->clearEffect();
     }
   }
 
   const auto* properties = object.paintProperties();
   if (properties && properties->effect()) {
     context.currentEffect = properties->effect();
     if (!properties->effect()->filter().isEmpty()) {
       // TODO(trchen): Change input clip to expansion hint once implemented.
       const ClipPaintPropertyNode* inputClip =
           properties->effect()->outputClip();
       context.inputClipOfCurrentEffect = context.current.clip =
           context.absolutePosition.clip = context.fixedPosition.clip =
               inputClip;
     }
   }
 }
 
 void PaintPropertyTreeBuilder::updateCssClip(
     const LayoutObject& object,
     PaintPropertyTreeBuilderContext& context) {
   if (object.needsPaintPropertyUpdate()) {
     if (object.hasClip()) {
       // Create clip node for descendants that are not fixed position.
       // We don't have to setup context.absolutePosition.clip here because this
       // object must be a container for absolute position descendants, and will
       // copy from in-flow context later at updateOutOfFlowContext() step.
       DCHECK(object.canContainAbsolutePositionObjects());
       LayoutRect clipRect =
           toLayoutBox(object).clipRect(context.current.paintOffset);
-      object.getMutableForPainting().ensurePaintProperties().updateCssClip(
+      auto& properties = object.getMutableForPainting().ensurePaintProperties();
+      context.forceSubtreeUpdate |= properties.updateCssClip(
           context.current.clip, context.current.transform,
           FloatRoundedRect(FloatRect(clipRect)));
     } else {
       if (auto* properties = object.getMutableForPainting().paintProperties())
-        properties->clearCssClip();
+        context.forceSubtreeUpdate |= properties->clearCssClip();
     }
   }
 
   const auto* properties = object.paintProperties();
   if (properties && properties->cssClip())
     context.current.clip = properties->cssClip();
 }
 
 void PaintPropertyTreeBuilder::updateLocalBorderBoxContext(
     const LayoutObject& object,
@@ skipping 16 matching lines @@
                                   context.current.scroll)));
     object.getMutableForPainting()
         .ensurePaintProperties()
         .setLocalBorderBoxProperties(std::move(borderBoxContext));
   }
 }
 
 // TODO(trchen): Remove this once we bake the paint offset into frameRect.
 void PaintPropertyTreeBuilder::updateScrollbarPaintOffset(
     const LayoutObject& object,
-    const PaintPropertyTreeBuilderContext& context) {
+    PaintPropertyTreeBuilderContext& context) {
   if (!object.needsPaintPropertyUpdate())
     return;
 
   bool needsScrollbarPaintOffset = false;
   IntPoint roundedPaintOffset = roundedIntPoint(context.current.paintOffset);
   if (roundedPaintOffset != IntPoint() && object.isBoxModelObject()) {
     if (auto* area = toLayoutBoxModelObject(object).getScrollableArea()) {
       if (area->horizontalScrollbar() || area->verticalScrollbar()) {
         auto paintOffset = TransformationMatrix().translate(
             roundedPaintOffset.x(), roundedPaintOffset.y());
-        object.getMutableForPainting()
-            .ensurePaintProperties()
-            .updateScrollbarPaintOffset(context.current.transform, paintOffset,
-                                        FloatPoint3D());
+        auto& properties =
+            object.getMutableForPainting().ensurePaintProperties();
+        context.forceSubtreeUpdate |= properties.updateScrollbarPaintOffset(
+            context.current.transform, paintOffset, FloatPoint3D());
         needsScrollbarPaintOffset = true;
       }
     }
   }
 
   auto* properties = object.getMutableForPainting().paintProperties();
   if (!needsScrollbarPaintOffset && properties)
-    properties->clearScrollbarPaintOffset();
+    context.forceSubtreeUpdate |= properties->clearScrollbarPaintOffset();
 }
 
 void PaintPropertyTreeBuilder::updateOverflowClip(
     const LayoutObject& object,
     PaintPropertyTreeBuilderContext& context) {
   if (!object.isBox())
     return;
 
   if (object.needsPaintPropertyUpdate()) {
     const LayoutBox& box = toLayoutBox(object);
     // The <input> elements can't have contents thus CSS overflow property
     // doesn't apply.  However for layout purposes we do generate child layout
     // objects for them, e.g. button label.  We should clip the overflow from
     // those children. This is called control clip and we technically treat them
     // like overflow clip.
     LayoutRect clipRect;
     if (box.hasControlClip()) {
       clipRect = box.controlClipRect(context.current.paintOffset);
     } else if (box.hasOverflowClip() || box.styleRef().containsPaint() ||
                (box.isSVGRoot() &&
                 toLayoutSVGRoot(box).shouldApplyViewportClip())) {
       clipRect = LayoutRect(pixelSnappedIntRect(
           box.overflowClipRect(context.current.paintOffset)));
     } else {
       if (auto* properties = object.getMutableForPainting().paintProperties()) {
-        properties->clearInnerBorderRadiusClip();
-        properties->clearOverflowClip();
+        context.forceSubtreeUpdate |= properties->clearInnerBorderRadiusClip();
+        context.forceSubtreeUpdate |= properties->clearOverflowClip();
       }
       return;
     }
 
+    auto& properties = object.getMutableForPainting().ensurePaintProperties();
     const auto* currentClip = context.current.clip;
     if (box.styleRef().hasBorderRadius()) {
       auto innerBorder = box.styleRef().getRoundedInnerBorderFor(
           LayoutRect(context.current.paintOffset, box.size()));
-      object.getMutableForPainting()
-          .ensurePaintProperties()
-          .updateInnerBorderRadiusClip(context.current.clip,
-                                       context.current.transform, innerBorder);
-      currentClip = object.paintProperties()->innerBorderRadiusClip();
-    } else if (auto* properties =
-                   object.getMutableForPainting().paintProperties()) {
-      properties->clearInnerBorderRadiusClip();
+      context.forceSubtreeUpdate |= properties.updateInnerBorderRadiusClip(
+          context.current.clip, context.current.transform, innerBorder);
+      currentClip = properties.innerBorderRadiusClip();
+    } else {
+      context.forceSubtreeUpdate |= properties.clearInnerBorderRadiusClip();
     }
 
-    object.getMutableForPainting().ensurePaintProperties().updateOverflowClip(
-        currentClip, context.current.transform,
-        FloatRoundedRect(FloatRect(clipRect)));
+    context.forceSubtreeUpdate |=
+        properties.updateOverflowClip(currentClip, context.current.transform,
+                                      FloatRoundedRect(FloatRect(clipRect)));
   }
 
   const auto* properties = object.paintProperties();
   if (properties && properties->overflowClip())
     context.current.clip = properties->overflowClip();
 }
 
 static FloatPoint perspectiveOrigin(const LayoutBox& box) {
   const ComputedStyle& style = box.styleRef();
   FloatSize borderBoxSize(box.size());
   return FloatPoint(
       floatValueForLength(style.perspectiveOriginX(), borderBoxSize.width()),
       floatValueForLength(style.perspectiveOriginY(), borderBoxSize.height()));
 }
 
 void PaintPropertyTreeBuilder::updatePerspective(
     const LayoutObject& object,
     PaintPropertyTreeBuilderContext& context) {
   if (object.needsPaintPropertyUpdate()) {
     const ComputedStyle& style = object.styleRef();
     if (object.isBox() && style.hasPerspective()) {
       // The perspective node must not flatten (else nothing will get
       // perspective), but it should still extend the rendering context as
       // most transform nodes do.
       TransformationMatrix matrix =
           TransformationMatrix().applyPerspective(style.perspective());
       FloatPoint3D origin = perspectiveOrigin(toLayoutBox(object)) +
                             toLayoutSize(context.current.paintOffset);
-      object.getMutableForPainting().ensurePaintProperties().updatePerspective(
+      auto& properties = object.getMutableForPainting().ensurePaintProperties();
+      context.forceSubtreeUpdate |= properties.updatePerspective(
           context.current.transform, matrix, origin,
           context.current.shouldFlattenInheritedTransform,
           context.current.renderingContextID);
     } else {
       if (auto* properties = object.getMutableForPainting().paintProperties())
-        properties->clearPerspective();
+        context.forceSubtreeUpdate |= properties->clearPerspective();
     }
   }
 
   const auto* properties = object.paintProperties();
   if (properties && properties->perspective()) {
     context.current.transform = properties->perspective();
     context.current.shouldFlattenInheritedTransform = false;
   }
 }
 
 void PaintPropertyTreeBuilder::updateSvgLocalToBorderBoxTransform(
     const LayoutObject& object,
     PaintPropertyTreeBuilderContext& context) {
   if (!object.isSVGRoot())
     return;
 
   if (object.needsPaintPropertyUpdate()) {
     AffineTransform transformToBorderBox =
         SVGRootPainter(toLayoutSVGRoot(object))
             .transformToPixelSnappedBorderBox(context.current.paintOffset);
     if (!transformToBorderBox.isIdentity()) {
-      object.getMutableForPainting()
-          .ensurePaintProperties()
-          .updateSvgLocalToBorderBoxTransform(
+      auto& properties = object.getMutableForPainting().ensurePaintProperties();
+      context.forceSubtreeUpdate |=
+          properties.updateSvgLocalToBorderBoxTransform(
               context.current.transform, transformToBorderBox, FloatPoint3D());
     } else {
-      if (auto* properties = object.getMutableForPainting().paintProperties())
-        properties->clearSvgLocalToBorderBoxTransform();
+      if (auto* properties = object.getMutableForPainting().paintProperties()) {
+        context.forceSubtreeUpdate |=
+            properties->clearSvgLocalToBorderBoxTransform();
+      }
     }
   }
 
   const auto* properties = object.paintProperties();
   if (properties && properties->svgLocalToBorderBoxTransform()) {
     context.current.transform = properties->svgLocalToBorderBoxTransform();
     context.current.shouldFlattenInheritedTransform = false;
     context.current.renderingContextID = 0;
   }
   // The paint offset is included in |transformToBorderBox| so SVG does not need
   // to handle paint offset internally.
   context.current.paintOffset = LayoutPoint();
 }
 
 void PaintPropertyTreeBuilder::updateScrollAndScrollTranslation(
     const LayoutObject& object,
     PaintPropertyTreeBuilderContext& context) {
   if (object.needsPaintPropertyUpdate()) {
     if (object.hasOverflowClip()) {
       const LayoutBox& box = toLayoutBox(object);
       const PaintLayerScrollableArea* scrollableArea = box.getScrollableArea();
       IntSize scrollOffset = box.scrolledContentOffset();
       if (!scrollOffset.isZero() || scrollableArea->scrollsOverflow()) {
+        auto& properties =
+            object.getMutableForPainting().ensurePaintProperties();
         TransformationMatrix matrix = TransformationMatrix().translate(
             -scrollOffset.width(), -scrollOffset.height());
-        object.getMutableForPainting()
-            .ensurePaintProperties()
-            .updateScrollTranslation(
-                context.current.transform, matrix, FloatPoint3D(),
-                context.current.shouldFlattenInheritedTransform,
-                context.current.renderingContextID);
+        context.forceSubtreeUpdate |= properties.updateScrollTranslation(
+            context.current.transform, matrix, FloatPoint3D(),
+            context.current.shouldFlattenInheritedTransform,
+            context.current.renderingContextID);
 
         IntSize scrollClip = scrollableArea->visibleContentRect().size();
         IntSize scrollBounds = scrollableArea->contentsSize();
         bool userScrollableHorizontal =
             scrollableArea->userInputScrollable(HorizontalScrollbar);
         bool userScrollableVertical =
             scrollableArea->userInputScrollable(VerticalScrollbar);
         MainThreadScrollingReasons reasons = 0;
         if (!object.document().settings()->threadedScrollingEnabled())
           reasons |= MainThreadScrollingReason::kThreadedScrollingDisabled;
         // Checking for descendants in the layout tree has two downsides:
         // 1) There can be more descendants in layout order than in paint
         //    order (e.g., fixed position objects).
         // 2) Iterating overall all background attachment fixed objects for
         //    every scroll node can be slow, though there will be no objects
         //    in the common case.
         const FrameView& frameView = *object.frameView();
         if (frameView.hasBackgroundAttachmentFixedDescendants(object)) {
           reasons |=
               MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects;
         }
-        object.getMutableForPainting().ensurePaintProperties().updateScroll(
-            context.current.scroll,
-            object.paintProperties()->scrollTranslation(), scrollClip,
+        context.forceSubtreeUpdate |= properties.updateScroll(
+            context.current.scroll, properties.scrollTranslation(), scrollClip,
             scrollBounds, userScrollableHorizontal, userScrollableVertical,
             reasons);
       } else {
         // Ensure pre-existing properties are cleared when there is no
         // scrolling.
         auto* properties = object.getMutableForPainting().paintProperties();
         if (properties) {
-          properties->clearScrollTranslation();
-          properties->clearScroll();
+          context.forceSubtreeUpdate |= properties->clearScrollTranslation();
+          context.forceSubtreeUpdate |= properties->clearScroll();
         }
       }
     }
   }
 
   if (object.paintProperties() && object.paintProperties()->scroll()) {
     context.current.transform = object.paintProperties()->scrollTranslation();
     context.current.scroll = object.paintProperties()->scroll();
     context.current.shouldFlattenInheritedTransform = false;
   }
@@ skipping 29 matching lines @@
     // need to insert the clip here if we are not a containing block ancestor of
     // them.
     auto* cssClip = object.getMutableForPainting().paintProperties()->cssClip();
 
     // Before we actually create anything, check whether in-flow context and
     // fixed-position context has exactly the same clip. Reuse if possible.
     if (context.fixedPosition.clip == cssClip->parent()) {
       context.fixedPosition.clip = cssClip;
     } else {
       if (object.needsPaintPropertyUpdate()) {
-        object.getMutableForPainting()
-            .ensurePaintProperties()
-            .updateCssClipFixedPosition(context.fixedPosition.clip,
-                                        const_cast<TransformPaintPropertyNode*>(
+        auto& properties =
+            object.getMutableForPainting().ensurePaintProperties();
+        context.forceSubtreeUpdate |= properties.updateCssClipFixedPosition(
+            context.fixedPosition.clip, const_cast<TransformPaintPropertyNode*>(
                                             cssClip->localTransformSpace()),
-                                        cssClip->clipRect());
+            cssClip->clipRect());
       }
       const auto* properties = object.paintProperties();
       if (properties && properties->cssClipFixedPosition())
         context.fixedPosition.clip = properties->cssClipFixedPosition();
       return;
     }
   }
 
   if (object.needsPaintPropertyUpdate()) {
     if (auto* properties = object.getMutableForPainting().paintProperties())
-      properties->clearCssClipFixedPosition();
+      context.forceSubtreeUpdate |= properties->clearCssClipFixedPosition();
   }
 }
 
 // Override ContainingBlockContext based on the properties of a containing block
 // that was previously walked in a subtree other than the current subtree being
 // walked. Used for out-of-flow positioned descendants of multi-column spanner
 // when the containing block is not in the normal tree walk order.
 // For example:
 // <div id="columns" style="columns: 2">
 //   <div id="relative" style="position: relative">
@@ skipping 110 matching lines @@
     }
   }
 }
 
 void PaintPropertyTreeBuilder::updatePropertiesForSelf(
     const LayoutObject& object,
     PaintPropertyTreeBuilderContext& context) {
   if (!object.isBoxModelObject() && !object.isSVG())
     return;
 
+  if (context.forceSubtreeUpdate) {
+    object.getMutableForPainting()
+        .setNeedsPaintPropertyUpdateWithoutMarkingAncestors();
+  }
+
 #if DCHECK_IS_ON()
-  FindObjectPropertiesNeedingUpdateScope checkNeedsUpdateScope(object);
+  FindObjectPropertiesNeedingUpdateScope checkNeedsUpdateScope(object, context);
 #endif
 
   deriveBorderBoxFromContainerContext(object, context);
 
   updatePaintOffsetTranslation(object, context);
   updateTransform(object, context);
   updateEffect(object, context);
   updateCssClip(object, context);
   updateLocalBorderBoxContext(object, context);
   updateScrollbarPaintOffset(object, context);
 }
 
 void PaintPropertyTreeBuilder::updatePropertiesForChildren(
     const LayoutObject& object,
     PaintPropertyTreeBuilderContext& context) {
   if (!object.isBoxModelObject() && !object.isSVG())
     return;
 
+  if (context.forceSubtreeUpdate) {
+    // This should have been set by |updatePropertiesForSelf|.
+    DCHECK(object.needsPaintPropertyUpdate());
+  }
+
 #if DCHECK_IS_ON()
-  FindObjectPropertiesNeedingUpdateScope checkNeedsUpdateScope(object);
+  FindObjectPropertiesNeedingUpdateScope checkNeedsUpdateScope(object, context);
 #endif
 
   updateOverflowClip(object, context);
   updatePerspective(object, context);
   updateSvgLocalToBorderBoxTransform(object, context);
   updateScrollAndScrollTranslation(object, context);
   updateOutOfFlowContext(object, context);
 }
 
 }  // namespace blink