Store local border box property cache outside ObjectPaintProperties

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 248 matching lines @@
 
 PaintResult PaintLayerPainter::paintLayerContents(
     GraphicsContext& context,
     const PaintLayerPaintingInfo& paintingInfoArg,
     PaintLayerFlags paintFlags,
     FragmentPolicy fragmentPolicy) {
   Optional<ScopedPaintChunkProperties> scopedPaintChunkProperties;
   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);
   }
 
   DCHECK(m_paintLayer.isSelfPaintingLayer() ||
          m_paintLayer.hasSelfPaintingLayerDescendant());
   DCHECK(!(paintFlags & PaintLayerAppliedTransform));
 
   bool isSelfPaintingLayer = m_paintLayer.isSelfPaintingLayer();
@@ skipping 201 matching lines @@
   }
 
   Optional<ScopedPaintChunkProperties> contentScopedPaintChunkProperties;
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled() &&
       !scopedPaintChunkProperties.has_value()) {
     // If layoutObject() is a LayoutView and root layer scrolling is enabled,
     // the LayoutView's paint properties will already have been applied at
     // 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);
   }
 
   bool selectionOnly =
       localPaintingInfo.getGlobalPaintFlags() & GlobalPaintSelectionOnly;
   {  // Begin block for the lifetime of any filter.
     FilterPainter filterPainter(m_paintLayer, context, offsetFromRoot,
                                 layerFragments.isEmpty()
@@ skipping 685 matching lines @@
           context, layoutObject, PaintPhaseClippingMask))
     return;
 
   IntRect snappedClipRect = pixelSnappedIntRect(clipRect.rect());
   LayoutObjectDrawingRecorder drawingRecorder(
       context, layoutObject, PaintPhaseClippingMask, snappedClipRect);
   context.fillRect(snappedClipRect, Color::black);
 }
 
 }  // namespace blink