Store local border box property cache outside ObjectPaintProperties

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

Index: third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
index abcaf8ad5b6885d1bb20970f12d0e52e533a58d9..62c79947d539e11a3f3b27ee4a95158bd4735da7 100644
--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
@@ -684,14 +684,13 @@ void PaintPropertyTreeBuilder::updateLocalBorderBoxContext(
   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);
   }
 }