Combine LayoutObject::previousPaintOffset and paintOffset in paint properties

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

 // Copyright 2014 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/PaintLayerPainter.h"
 
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/ClipPathClipper.h"
 #include "core/paint/FilterPainter.h"
@@ skipping 249 matching lines @@
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled() &&
       RuntimeEnabledFeatures::rootLayerScrollingEnabled() &&
       m_paintLayer.layoutObject() &&
       m_paintLayer.layoutObject()->isLayoutView()) {
     const auto* objectPaintProperties =
         m_paintLayer.layoutObject()->paintProperties();
     DCHECK(objectPaintProperties &&
            objectPaintProperties->localBorderBoxProperties());
     PaintChunkProperties properties(
         context.getPaintController().currentPaintChunkProperties());
-    auto& localBorderBoxProperties =
+    properties.propertyTreeState =
         *objectPaintProperties->localBorderBoxProperties();
-    properties.propertyTreeState = localBorderBoxProperties.propertyTreeState;
     properties.backfaceHidden =
         m_paintLayer.layoutObject()->hasHiddenBackface();
     scopedPaintChunkProperties.emplace(context.getPaintController(),
                                        m_paintLayer, properties);
   }
 
   DCHECK(m_paintLayer.isSelfPaintingLayer() ||
          m_paintLayer.hasSelfPaintingLayerDescendant());
   DCHECK(!(paintFlags & PaintLayerAppliedTransform));
 
@@ skipping 214 matching lines @@
       // the top of this method, in scopedPaintChunkProperties.
       DCHECK(!(RuntimeEnabledFeatures::rootLayerScrollingEnabled() &&
                m_paintLayer.layoutObject() &&
                m_paintLayer.layoutObject()->isLayoutView()));
       const auto* objectPaintProperties =
           m_paintLayer.layoutObject()->paintProperties();
       DCHECK(objectPaintProperties &&
              objectPaintProperties->localBorderBoxProperties());
       PaintChunkProperties properties(
           context.getPaintController().currentPaintChunkProperties());
-      auto& localBorderBoxProperties =
+      properties.propertyTreeState =
           *objectPaintProperties->localBorderBoxProperties();
-      properties.propertyTreeState = localBorderBoxProperties.propertyTreeState;
       properties.backfaceHidden =
           m_paintLayer.layoutObject()->hasHiddenBackface();
       contentScopedPaintChunkProperties.emplace(context.getPaintController(),
                                                 m_paintLayer, properties);
     }
 
     bool isPaintingRootLayer = (&m_paintLayer) == paintingInfo.rootLayer;
     bool shouldPaintBackground =
         shouldPaintContent && !selectionOnly &&
         (isPaintingCompositedBackground ||
@@ skipping 439 matching lines @@
   }
 
   LayoutRect newCullRect(clipRect.rect());
   Optional<ScrollRecorder> scrollRecorder;
   LayoutPoint paintOffset = -m_paintLayer.layoutBoxLocation();
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     const auto* objectPaintProperties =
         m_paintLayer.layoutObject()->paintProperties();
     DCHECK(objectPaintProperties &&
            objectPaintProperties->localBorderBoxProperties());
-    paintOffset +=
-        toSize(objectPaintProperties->localBorderBoxProperties()->paintOffset);
+    paintOffset += m_paintLayer.layoutObject()->paintOffset();
     newCullRect.move(paintingInfo.scrollOffsetAccumulation);
   } else {
     paintOffset += toSize(fragment.layerBounds.location());
     if (!paintingInfo.scrollOffsetAccumulation.isZero()) {
       // As a descendant of the root layer, m_paintLayer's painting is not
       // controlled by the ScrollRecorders created by BlockPainter of the
       // ancestor layers up to the root layer, so we need to issue
       // ScrollRecorder for this layer seperately, with the scroll offset
       // accumulated from the root layer to the parent of this layer, to get the
       // same result as ScrollRecorder in BlockPainter.
@@ skipping 200 matching lines @@
           context, *layoutBox, PaintPhaseClippingMask))
     return;
 
   IntRect snappedClipRect = pixelSnappedIntRect(clipRect.rect());
   LayoutObjectDrawingRecorder drawingRecorder(
       context, *layoutBox, PaintPhaseClippingMask, snappedClipRect);
   context.fillRect(snappedClipRect, Color::black);
 }
 
 }  // namespace blink