Store local border box property cache outside ObjectPaintProperties

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

 // Copyright 2015 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/PaintPropertyTreeBuilder.h"
 
 #include <memory>
 #include "core/dom/DOMNodeIds.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 666 matching lines @@
   if (properties && properties->cssClip())
     context.current.clip = properties->cssClip();
 }
 
 void PaintPropertyTreeBuilder::updateLocalBorderBoxContext(
     const LayoutObject& object,
     PaintPropertyTreeBuilderContext& context) {
   if (!object.needsPaintPropertyUpdate() && !context.forceSubtreeUpdate)
     return;
 
-  // We need localBorderBoxProperties for layered objects only.
+  // We only need to cache the local border box properties for layered objects.
   if (!object.hasLayer()) {
-    if (auto* properties = object.getMutableForPainting().paintProperties())
-      properties->clearLocalBorderBoxProperties();
+    object.getMutableForPainting().clearLocalBorderBoxProperties();
   } else {
-    auto& properties = object.getMutableForPainting().ensurePaintProperties();
-    properties.updateLocalBorderBoxProperties(
+    PropertyTreeState localBorderBox = PropertyTreeState(
         context.current.transform, context.current.clip, context.currentEffect);
+    object.getMutableForPainting().setLocalBorderBoxProperties(localBorderBox);
   }
 }
 
 // TODO(trchen): Remove this once we bake the paint offset into frameRect.
 void PaintPropertyTreeBuilder::updateScrollbarPaintOffset(
     const LayoutObject& object,
     PaintPropertyTreeBuilderContext& context) {
   if (!object.needsPaintPropertyUpdate() && !context.forceSubtreeUpdate)
     return;
 
@@ skipping 427 matching lines @@
   updateOverflowClip(object, context);
   updatePerspective(object, context);
   updateSvgLocalToBorderBoxTransform(object, context);
   updateScrollAndScrollTranslation(object, context);
   updateOutOfFlowContext(object, context);
 
   context.forceSubtreeUpdate |= object.subtreeNeedsPaintPropertyUpdate();
 }
 
 }  // namespace blink