[SPInvalidation] Fix paint offset issue of descendants of composited svg root

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

 // Copyright 2016 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/PaintInvalidator.h"
 
 #include "core/editing/FrameSelection.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
@@ skipping 55 matching lines @@
     if (context.forcedSubtreeInvalidationFlags & PaintInvalidatorContext::ForcedSubtreeSlowPathRect) {
         result = slowMapToVisualRectInAncestorSpace(object, *context.paintInvalidationContainer, rect);
     } else if (object == context.paintInvalidationContainer) {
         result = LayoutRect(rect);
     } else {
         rect.moveBy(FloatPoint(context.treeBuilderContext.current.paintOffset));
 
         GeometryPropertyTreeState currentTreeState(context.treeBuilderContext.current.transform, context.treeBuilderContext.current.clip, context.treeBuilderContext.currentEffect);
         GeometryPropertyTreeState containerTreeState;
         const ObjectPaintProperties* containerPaintProperties = context.paintInvalidationContainer->objectPaintProperties();
-        containerPaintProperties->getContentsProperties(containerTreeState);
+        LayoutPoint paintOffsetFromContainerTreeState;
+        containerPaintProperties->getContentsPropertyTreeState(containerTreeState, paintOffsetFromContainerTreeState);
 
         bool success = false;
         result = LayoutRect(geometryMapper.mapToVisualRectInDestinationSpace(rect, currentTreeState, containerTreeState, success));
         DCHECK(success);
-        result.moveBy(-containerPaintProperties->localBorderBoxProperties()->paintOffset);
+
+        // Convert the result from containerTreeState space to the container's contents space.
+        result.moveBy(-paintOffsetFromContainerTreeState);
     }
 
     if (context.paintInvalidationContainer->layer()->groupedMapping())
         PaintLayer::mapRectInPaintInvalidationContainerToBacking(*context.paintInvalidationContainer, result);
     return result;
 }
 
 void PaintInvalidatorContext::mapLocalRectToPaintInvalidationBacking(const LayoutObject& object, LayoutRect& rect) const
 {
     GeometryMapper geometryMapper;
@@ skipping 15 matching lines @@
 
     return mapLocalRectToPaintInvalidationBacking(object, localRect, context);
 }
 
 LayoutPoint PaintInvalidator::computeLocationFromPaintInvalidationBacking(const LayoutObject& object, const PaintInvalidatorContext& context)
 {
     FloatPoint point;
     if (object != context.paintInvalidationContainer) {
         point.moveBy(FloatPoint(context.treeBuilderContext.current.paintOffset));
 
-        bool success = false;
         GeometryPropertyTreeState currentTreeState(context.treeBuilderContext.current.transform, context.treeBuilderContext.current.clip, context.treeBuilderContext.currentEffect);
         GeometryPropertyTreeState containerTreeState;
-        context.paintInvalidationContainer->objectPaintProperties()->getContentsProperties(containerTreeState);
+        LayoutPoint paintOffsetFromContainerTreeState;
+        context.paintInvalidationContainer->objectPaintProperties()->getContentsPropertyTreeState(containerTreeState, paintOffsetFromContainerTreeState);
+
+        bool success = false;
         point = m_geometryMapper.mapRectToDestinationSpace(FloatRect(point, FloatSize()), currentTreeState, containerTreeState, success).location();
         DCHECK(success);
+
+        // Convert the result from containerTreeState space to the container's contents space.
+        point.moveBy(-paintOffsetFromContainerTreeState);
     }
 
     if (context.paintInvalidationContainer->layer()->groupedMapping())
         PaintLayer::mapPointInPaintInvalidationContainerToBacking(*context.paintInvalidationContainer, point);
 
     return LayoutPoint(point);
 }
 
 void PaintInvalidator::updatePaintingLayer(const LayoutObject& object, PaintInvalidatorContext& context)
 {
@@ skipping 180 matching lines @@
     object.getMutableForPainting().clearPaintInvalidationFlags();
 }
 
 void PaintInvalidator::processPendingDelayedPaintInvalidations()
 {
     for (auto target : m_pendingDelayedPaintInvalidations)
         target->getMutableForPainting().setShouldDoFullPaintInvalidation(PaintInvalidationDelayedFull);
 }
 
 } // namespace blink