Unify GeometryPropertyTreeState and PropertyTreeState

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

Index: third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
index f783fb86b6bee59504637caca596be940774599f..266f59d3bdc26fbf1519e946160ada2a2d408336 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
@@ -420,11 +420,10 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContents(
       auto& localBorderBoxProperties =
           *objectPaintProperties->localBorderBoxProperties();
       properties.transform =
-          localBorderBoxProperties.geometryPropertyTreeState.transform;
-      properties.scroll = localBorderBoxProperties.scroll;
-      properties.clip = localBorderBoxProperties.geometryPropertyTreeState.clip;
-      properties.effect =
-          localBorderBoxProperties.geometryPropertyTreeState.effect;
+          localBorderBoxProperties.propertyTreeState.transform();
+      properties.scroll = localBorderBoxProperties.propertyTreeState.scroll();
+      properties.clip = localBorderBoxProperties.propertyTreeState.clip();
+      properties.effect = localBorderBoxProperties.propertyTreeState.effect();
       properties.backfaceHidden =
           m_paintLayer.layoutObject()->hasHiddenBackface();
       scopedPaintChunkProperties.emplace(context.getPaintController(),