Combine LayoutObject::previousPaintOffset and paintOffset in paint properties

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
  * reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
@@ skipping 196 matching lines @@
   ClipRectsContext context(clippingRootLayer, PaintingClipRects);
   if (m_geometryMapper) {
     ClipRect clipRect = applyOverflowClipToBackgroundRectWithGeometryMapper(
         context, clipRectWithGeometryMapper(context, false));
 
     // The rect now needs to be transformed to the local space of this
     // PaintLayer.
     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);
 
     return LayoutRect(clippedRectInLocalSpace);
   }
 
   LayoutRect layerBounds;
   ClipRect backgroundRect, foregroundRect;
   calculateRects(context, LayoutRect(LayoutRect::infiniteIntRect()),
                  layerBounds, backgroundRect, foregroundRect);
@@ skipping 15 matching lines @@
   CHECK((expected.isEmpty() && actual.isEmpty()) || expected == actual) \
       << "expected=" << expected.toString() << " actual=" << actual.toString()
 #endif
 
 void PaintLayerClipper::mapLocalToRootWithGeometryMapper(
     const ClipRectsContext& context,
     LayoutRect& layoutRect) const {
   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);
 }
 
 void PaintLayerClipper::calculateRectsWithGeometryMapper(
     const ClipRectsContext& context,
     const LayoutRect& paintDirtyRect,
     LayoutRect& layerBounds,
     ClipRect& backgroundRect,
     ClipRect& foregroundRect,
@@ skipping 149 matching lines @@
 }
 
 ClipRect PaintLayerClipper::clipRectWithGeometryMapper(
     const ClipRectsContext& context,
     bool isForeground) const {
   DCHECK(m_geometryMapper);
   LayoutRect source(LayoutRect::infiniteIntRect());
   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());
 
   const auto* ancestorProperties =
       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());
   }
   FloatRect clippedRectInRootLayerSpace =
       m_geometryMapper->mapToVisualRectInDestinationSpace(
           FloatRect(source), propertyTreeState, destinationPropertyTreeState,
           success);
   DCHECK(success);
   return ClipRect(LayoutRect(clippedRectInRootLayerSpace));
@@ skipping 92 matching lines @@
     const LayoutSize& subpixelAccumulation) const {
   DCHECK(!m_geometryMapper);
   ClipRectsContext context(rootLayer, PaintingClipRects,
                            IgnoreOverlayScrollbarSize, subpixelAccumulation);
   if (respectOverflowClip == IgnoreOverflowClip)
     context.setIgnoreOverflowClip();
   return getClipRects(context);
 }
 
 }  // namespace blink