Combine LayoutObject::previousPaintOffset and paintOffset in paint properties

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

Index: third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp b/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
index 3f8a6de6090b6dedea8057046b768ba5a7b09be4..95dee038085c6cede1048e504c468061ba4b6028 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
@@ -214,14 +214,12 @@ LayoutRect PaintLayerClipper::localClipRect(
     bool success = false;
     FloatRect clippedRectInLocalSpace =
         m_geometryMapper->mapRectToDestinationSpace(
-            FloatRect(clipRect.rect()), clippingRootLayer->layoutObject()
-                                            ->paintProperties()
-                                            ->localBorderBoxProperties()
-                                            ->propertyTreeState,
-            m_layer.layoutObject()
-                ->paintProperties()
-                ->localBorderBoxProperties()
-                ->propertyTreeState,
+            FloatRect(clipRect.rect()), *clippingRootLayer->layoutObject()
+                                             ->paintProperties()
+                                             ->localBorderBoxProperties(),
+            *m_layer.layoutObject()
+                 ->paintProperties()
+                 ->localBorderBoxProperties(),
             success);
     DCHECK(success);
 
@@ -257,18 +255,15 @@ void PaintLayerClipper::mapLocalToRootWithGeometryMapper(
   DCHECK(m_geometryMapper);
   bool success;
 
-  const ObjectPaintProperties::PropertyTreeStateWithOffset*
-      layerBorderBoxProperties =
-          m_layer.layoutObject()->paintProperties()->localBorderBoxProperties();
+  const auto* layerBorderBoxProperties =
+      m_layer.layoutObject()->paintProperties()->localBorderBoxProperties();
   FloatRect localRect(layoutRect);
-  localRect.moveBy(FloatPoint(layerBorderBoxProperties->paintOffset));
+  localRect.moveBy(FloatPoint(m_layer.layoutObject()->paintOffset()));
 
   layoutRect = LayoutRect(m_geometryMapper->mapRectToDestinationSpace(
-      localRect, layerBorderBoxProperties->propertyTreeState,
-      context.rootLayer->layoutObject()
-          ->paintProperties()
-          ->localBorderBoxProperties()
-          ->propertyTreeState,
+      localRect, *layerBorderBoxProperties, *context.rootLayer->layoutObject()
+                                                 ->paintProperties()
+                                                 ->localBorderBoxProperties(),
       success));
   DCHECK(success);
 }
@@ -438,8 +433,7 @@ ClipRect PaintLayerClipper::clipRectWithGeometryMapper(
   bool success = false;
   const auto* properties = m_layer.layoutObject()->paintProperties();
   DCHECK(properties && properties->localBorderBoxProperties());
-  PropertyTreeState propertyTreeState =
-      properties->localBorderBoxProperties()->propertyTreeState;
+  PropertyTreeState propertyTreeState = *properties->localBorderBoxProperties();
 
   if (isForeground && shouldClipOverflow(context) && properties->overflowClip())
     propertyTreeState.setClip(properties->overflowClip());
@@ -448,7 +442,7 @@ ClipRect PaintLayerClipper::clipRectWithGeometryMapper(
       context.rootLayer->layoutObject()->paintProperties();
   DCHECK(ancestorProperties && ancestorProperties->localBorderBoxProperties());
   PropertyTreeState destinationPropertyTreeState =
-      ancestorProperties->localBorderBoxProperties()->propertyTreeState;
+      *ancestorProperties->localBorderBoxProperties();
   if (!context.rootLayer->clipper().shouldRespectOverflowClip(context)) {
     if (ancestorProperties->overflowClip())
       destinationPropertyTreeState.setClip(ancestorProperties->overflowClip());