Store local border box property cache outside ObjectPaintProperties

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

Index: third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
index 8165be07c17c0a1bc1d635920683fca0955c750e..7534363c54277733486e6b18333c7b1c72ac6ba0 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
@@ -267,14 +267,12 @@ PaintResult PaintLayerPainter::paintLayerContents(
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled() &&
       RuntimeEnabledFeatures::rootLayerScrollingEnabled() &&
       m_paintLayer.layoutObject().isLayoutView()) {
-    const auto* objectPaintProperties =
-        m_paintLayer.layoutObject().paintProperties();
-    DCHECK(objectPaintProperties &&
-           objectPaintProperties->localBorderBoxProperties());
+    const auto* localBorderBoxProperties =
+        m_paintLayer.layoutObject().localBorderBoxProperties();
+    DCHECK(localBorderBoxProperties);
     PaintChunkProperties properties(
         context.getPaintController().currentPaintChunkProperties());
-    properties.propertyTreeState =
-        *objectPaintProperties->localBorderBoxProperties();
+    properties.propertyTreeState = *localBorderBoxProperties;
     properties.backfaceHidden = m_paintLayer.layoutObject().hasHiddenBackface();
     scopedPaintChunkProperties.emplace(context.getPaintController(),
                                        m_paintLayer, properties);
@@ -496,14 +494,12 @@ PaintResult PaintLayerPainter::paintLayerContents(
     // the top of this method, in scopedPaintChunkProperties.
     DCHECK(!(RuntimeEnabledFeatures::rootLayerScrollingEnabled() &&
              m_paintLayer.layoutObject().isLayoutView()));
-    const auto* objectPaintProperties =
-        m_paintLayer.layoutObject().paintProperties();
-    DCHECK(objectPaintProperties &&
-           objectPaintProperties->localBorderBoxProperties());
+    const auto* localBorderBoxProperties =
+        m_paintLayer.layoutObject().localBorderBoxProperties();
+    DCHECK(localBorderBoxProperties);
     PaintChunkProperties properties(
         context.getPaintController().currentPaintChunkProperties());
-    properties.propertyTreeState =
-        *objectPaintProperties->localBorderBoxProperties();
+    properties.propertyTreeState = *localBorderBoxProperties;
     properties.backfaceHidden = m_paintLayer.layoutObject().hasHiddenBackface();
     contentScopedPaintChunkProperties.emplace(context.getPaintController(),
                                               m_paintLayer, properties);