Define contentsProperties on ObjectPaintProperties, for use in paint invalidation.

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 6e3efb5cda08a3f107c7093763000d6e2d586eff..55a47fbbe47d8ced7430f5f2137af3783926cb3d 100644
--- a/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
@@ -37,7 +37,8 @@ static LayoutRect mapLocalRectToPaintInvalidationBacking(GeometryMapper& geometr
 
         bool success = false;
         PropertyTreeState currentTreeState(context.treeBuilderContext.current.transform, context.treeBuilderContext.current.clip, context.treeBuilderContext.currentEffect);
-        const PropertyTreeState& containerTreeState = context.paintInvalidationContainer->objectPaintProperties()->localBorderBoxProperties()->propertyTreeState;
+        PropertyTreeState containerTreeState;
+        context.paintInvalidationContainer->objectPaintProperties()->getContentsProperties(containerTreeState);
         result = LayoutRect(geometryMapper.mapToVisualRectInDestinationSpace(rect, currentTreeState, containerTreeState, success));
         DCHECK(success);
     }
@@ -77,7 +78,8 @@ LayoutPoint PaintInvalidator::computeLocationFromPaintInvalidationBacking(const
 
         bool success = false;
         PropertyTreeState currentTreeState(context.treeBuilderContext.current.transform, context.treeBuilderContext.current.clip, context.treeBuilderContext.currentEffect);
-        const PropertyTreeState& containerTreeState = context.paintInvalidationContainer->objectPaintProperties()->localBorderBoxProperties()->propertyTreeState;
+        PropertyTreeState containerTreeState;
+        context.paintInvalidationContainer->objectPaintProperties()->getContentsProperties(containerTreeState);
         point = m_geometryMapper.mapRectToDestinationSpace(FloatRect(point, FloatSize()), currentTreeState, containerTreeState, success).location();
         DCHECK(success);
     }