Store local border box property cache outside ObjectPaintProperties

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

Index: third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp b/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
index eeedfe7e0d7d5aceab040af5ea114e5c1f5e344b..b208df2e9058015007e597387b0e3d6d2f944ccf 100644
--- a/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
@@ -105,8 +105,7 @@ LayoutRect PaintInvalidator::mapLocalRectToVisualRectInBacking(
       rect.moveBy(Point(object.paintOffset()));
 
     const auto* containerContentsProperties =
-        context.paintInvalidationContainer->paintProperties()
-            ->contentsProperties();
+        context.paintInvalidationContainer->contentsProperties();
 
     if (context.m_treeBuilderContext.current.transform ==
             containerContentsProperties->transform() &&
@@ -180,9 +179,7 @@ LayoutPoint PaintInvalidator::computeLocationInBacking(
     point.moveBy(object.paintOffset());
 
     const auto* containerTransform =
-        context.paintInvalidationContainer->paintProperties()
-            ->contentsProperties()
-            ->transform();
+        context.paintInvalidationContainer->contentsProperties()->transform();
     if (context.m_treeBuilderContext.current.transform != containerTransform) {
       FloatRect rect = FloatRect(FloatPoint(point), FloatSize());
       context.m_geometryMapper.sourceToDestinationRect(