Unify GeometryPropertyTreeState and PropertyTreeState

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

 // Copyright 2014 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/PaintLayerPainter.h"
 
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/ClipPathClipper.h"
@@ skipping 402 matching lines @@
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
       const ObjectPaintProperties* objectPaintProperties =
           m_paintLayer.layoutObject()->objectPaintProperties();
       ASSERT(objectPaintProperties &&
              objectPaintProperties->localBorderBoxProperties());
       PaintChunkProperties properties(
           context.getPaintController().currentPaintChunkProperties());
       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(),
                                          m_paintLayer, properties);
     }
 
     bool isPaintingRootLayer = (&m_paintLayer) == paintingInfo.rootLayer;
     bool shouldPaintBackground =
         shouldPaintContent && !selectionOnly &&
         (isPaintingCompositedBackground ||
@@ skipping 609 matching lines @@
 
   PaintLayerPaintingInfo paintingInfo(&m_paintLayer,
                                       LayoutRect(enclosingIntRect(damageRect)),
                                       paintFlags, LayoutSize());
   paintLayer(context, paintingInfo, PaintLayerPaintingOverlayScrollbars);
 
   m_paintLayer.setContainsDirtyOverlayScrollbars(false);
 }
 
 }  // namespace blink