Unify GeometryPropertyTreeState and PropertyTreeState

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 65 matching lines @@
   LayoutRect result;
   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(
+    PropertyTreeState currentTreeState(
         context.treeBuilderContext.current.transform,
         context.treeBuilderContext.current.clip,
-        context.treeBuilderContext.currentEffect);
-    GeometryPropertyTreeState containerTreeState;
+        context.treeBuilderContext.currentEffect,
+        context.treeBuilderContext.current.scroll);
     const ObjectPaintProperties* containerPaintProperties =
         context.paintInvalidationContainer->objectPaintProperties();
-    LayoutPoint paintOffsetFromContainerTreeState;
-    containerPaintProperties->getContentsPropertyTreeState(
-        containerTreeState, paintOffsetFromContainerTreeState);
+    auto containerContentsProperties =
+        containerPaintProperties->contentsProperties();
 
     bool success = false;
     result = LayoutRect(geometryMapper.mapToVisualRectInDestinationSpace(
-        rect, currentTreeState, containerTreeState, success));
+        rect, currentTreeState, containerContentsProperties.propertyTreeState,
+        success));
     DCHECK(success);
 
-    // Convert the result from containerTreeState space to the container's contents space.
-    result.moveBy(-paintOffsetFromContainerTreeState);
+    // Convert the result to the container's contents space.
+    result.moveBy(-containerContentsProperties.paintOffset);
   }
 
   if (context.paintInvalidationContainer->layer()->groupedMapping())
     PaintLayer::mapRectInPaintInvalidationContainerToBacking(
         *context.paintInvalidationContainer, result);
   return result;
 }
 
 void PaintInvalidatorContext::mapLocalRectToPaintInvalidationBacking(
     const LayoutObject& object,
@@ skipping 23 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));
 
-    GeometryPropertyTreeState currentTreeState(
+    PropertyTreeState currentTreeState(
         context.treeBuilderContext.current.transform,
         context.treeBuilderContext.current.clip,
-        context.treeBuilderContext.currentEffect);
-    GeometryPropertyTreeState containerTreeState;
-    LayoutPoint paintOffsetFromContainerTreeState;
-    context.paintInvalidationContainer->objectPaintProperties()
-        ->getContentsPropertyTreeState(containerTreeState,
-                                       paintOffsetFromContainerTreeState);
+        context.treeBuilderContext.currentEffect,
+        context.treeBuilderContext.current.scroll);
+    const ObjectPaintProperties* containerPaintProperties =
+        context.paintInvalidationContainer->objectPaintProperties();
+    auto containerContentsProperties =
+        containerPaintProperties->contentsProperties();
 
     bool success = false;
     point = m_geometryMapper
-                .mapRectToDestinationSpace(FloatRect(point, FloatSize()),
-                                           currentTreeState, containerTreeState,
-                                           success)
+                .mapRectToDestinationSpace(
+                    FloatRect(point, FloatSize()), currentTreeState,
+                    containerContentsProperties.propertyTreeState, success)
                 .location();
     DCHECK(success);
 
-    // Convert the result from containerTreeState space to the container's contents space.
-    point.moveBy(-paintOffsetFromContainerTreeState);
+    // Convert the result to the container's contents space.
+    point.moveBy(-containerContentsProperties.paintOffset);
   }
 
   if (context.paintInvalidationContainer->layer()->groupedMapping())
     PaintLayer::mapPointInPaintInvalidationContainerToBacking(
         *context.paintInvalidationContainer, point);
 
   return LayoutPoint(point);
 }
 
 void PaintInvalidator::updatePaintingLayer(const LayoutObject& object,
@@ skipping 251 matching lines @@
   object.getMutableForPainting().clearPaintInvalidationFlags();
 }
 
 void PaintInvalidator::processPendingDelayedPaintInvalidations() {
   for (auto target : m_pendingDelayedPaintInvalidations)
     target->getMutableForPainting().setShouldDoFullPaintInvalidation(
         PaintInvalidationDelayedFull);
 }
 
 }  // namespace blink