Unify GeometryPropertyTreeState and PropertyTreeState

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

 // Copyright 2015 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/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutTreeAsText.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintPropertyTreePrinter.h"
 #include "platform/graphics/paint/GeometryMapper.h"
@@ skipping 79 matching lines @@
                           slopFactor)                                          \
   do {                                                                         \
     GeometryMapper geometryMapper;                                             \
     LayoutRect source(                                                         \
         (sourceLayoutObject)->localOverflowRectForPaintInvalidation());        \
     source.moveBy((sourceLayoutObject)                                         \
                       ->objectPaintProperties()                                \
                       ->localBorderBoxProperties()                             \
                       ->paintOffset);                                          \
     bool success = false;                                                      \
-    GeometryPropertyTreeState contentsTreeState;                               \
-    LayoutPoint paintOffsetFromContentsTreeState;                              \
-    (ancestorLayoutObject)                                                     \
-        ->objectPaintProperties()                                              \
-        ->getContentsPropertyTreeState(contentsTreeState,                      \
-                                       paintOffsetFromContentsTreeState);      \
+    auto contentsProperties =                                                  \
+        (ancestorLayoutObject)->objectPaintProperties()->contentsProperties(); \
     LayoutRect actual =                                                        \
         LayoutRect(geometryMapper.mapToVisualRectInDestinationSpace(           \
             FloatRect(source), (sourceLayoutObject)                            \
                                    ->objectPaintProperties()                   \
                                    ->localBorderBoxProperties()                \
-                                   ->geometryPropertyTreeState,                \
-            contentsTreeState, success));                                      \
+                                   ->propertyTreeState,                        \
+            contentsProperties.propertyTreeState, success));                   \
     ASSERT_TRUE(success);                                                      \
-    actual.moveBy(-paintOffsetFromContentsTreeState);                          \
+    actual.moveBy(-contentsProperties.paintOffset);                            \
     EXPECT_EQ(expected, actual)                                                \
         << "GeometryMapper: expected: " << expected.toString()                 \
         << ", actual: " << actual.toString();                                  \
                                                                                \
     if (slopFactor == LayoutUnit::max())                                       \
       break;                                                                   \
     LayoutRect slowPathRect =                                                  \
         (sourceLayoutObject)->localOverflowRectForPaintInvalidation();         \
     (sourceLayoutObject)                                                       \
         ->mapToVisualRectInAncestorSpace(ancestorLayoutObject, slowPathRect);  \
@@ skipping 965 matching lines @@
       "</div>");
   FrameView* frameView = document().view();
 
   LayoutObject* scroller =
       document().getElementById("scroller")->layoutObject();
   const ObjectPaintProperties* scrollerProperties =
       scroller->objectPaintProperties();
   LayoutObject* child = document().getElementById("child")->layoutObject();
   const ObjectPaintProperties* childProperties = child->objectPaintProperties();
 
-  EXPECT_EQ(scrollerProperties->overflowClip(),
-            childProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.clip);
+  EXPECT_EQ(
+      scrollerProperties->overflowClip(),
+      childProperties->localBorderBoxProperties()->propertyTreeState.clip());
   EXPECT_EQ(scrollerProperties->scrollTranslation(),
             childProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.transform);
-  EXPECT_NE(nullptr, childProperties->localBorderBoxProperties()
-                         ->geometryPropertyTreeState.effect);
+                ->propertyTreeState.transform());
+  EXPECT_NE(
+      nullptr,
+      childProperties->localBorderBoxProperties()->propertyTreeState.effect());
   CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 400, 300), scroller,
                           frameView->layoutView());
   CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 100, 200), child,
                           frameView->layoutView());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest,
        TreeContextUnclipFromParentStackingContext) {
   // This test verifies the tree builder correctly computes and records the property tree context
   // for a (pseudo) stacking context that has a scrolling painting ancestor that is not its
   // containing block (thus should not be scrolled by it).
 
   setBodyInnerHTML(
       "<style>body { margin: 0; }</style>"
       "<div id='scroller' style='overflow:scroll; opacity:0.5;'>"
       "  <div id='child' style='position:absolute; left:0; top:0; width: "
       "100px; height: 200px'></div>"
       "  <div style='height:10000px;'></div>"
       "</div>");
 
   LayoutObject& scroller =
       *document().getElementById("scroller")->layoutObject();
   const ObjectPaintProperties* scrollerProperties =
       scroller.objectPaintProperties();
   LayoutObject& child = *document().getElementById("child")->layoutObject();
   const ObjectPaintProperties* childProperties = child.objectPaintProperties();
 
-  EXPECT_EQ(frameContentClip(), childProperties->localBorderBoxProperties()
-                                    ->geometryPropertyTreeState.clip);
+  EXPECT_EQ(
+      frameContentClip(),
+      childProperties->localBorderBoxProperties()->propertyTreeState.clip());
   EXPECT_EQ(frameScrollTranslation(),
             childProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.transform);
-  EXPECT_EQ(scrollerProperties->effect(),
-            childProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.effect);
+                ->propertyTreeState.transform());
+  EXPECT_EQ(
+      scrollerProperties->effect(),
+      childProperties->localBorderBoxProperties()->propertyTreeState.effect());
   if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 800, 10000), &scroller,
                             document().view()->layoutView());
   }
   CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 100, 200), &child,
                           document().view()->layoutView());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, TableCellLayoutLocation) {
   // This test verifies that the border box space of a table cell is being correctly computed.
@@ skipping 25 matching lines @@
       "  <tr><td></td><td><div id='target'></div></td></tr>"
       "</table>");
 
   LayoutObject& target = *document().getElementById("target")->layoutObject();
   const ObjectPaintProperties* targetProperties =
       target.objectPaintProperties();
 
   EXPECT_EQ(LayoutPoint(170, 170),
             targetProperties->localBorderBoxProperties()->paintOffset);
   EXPECT_EQ(framePreTranslation(), targetProperties->localBorderBoxProperties()
-                                       ->geometryPropertyTreeState.transform);
+                                       ->propertyTreeState.transform());
   CHECK_EXACT_VISUAL_RECT(LayoutRect(170, 170, 100, 100), &target,
                           document().view()->layoutView());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, CSSClipFixedPositionDescendant) {
   // This test verifies that clip tree hierarchy being generated correctly for the hard case
   // such that a fixed position element getting clipped by an absolute position CSS clip.
   setBodyInnerHTML(
       "<style>"
       "  #clip {"
@@ skipping 24 matching lines @@
             clipProperties->cssClip()->localTransformSpace());
   EXPECT_EQ(FloatRoundedRect(FloatRect(absoluteClipRect)),
             clipProperties->cssClip()->clipRect());
   CHECK_VISUAL_RECT(
       absoluteClipRect, &clip, document().view()->layoutView(),
       // TODO(crbug.com/599939): mapToVisualRectInAncestorSpace() doesn't apply css clip on the object itself.
       LayoutUnit::max());
 
   LayoutObject* fixed = document().getElementById("fixed")->layoutObject();
   const ObjectPaintProperties* fixedProperties = fixed->objectPaintProperties();
-  EXPECT_EQ(clipProperties->cssClip(),
-            fixedProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.clip);
-  EXPECT_EQ(framePreTranslation(),
-            fixedProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.transform->parent());
+  EXPECT_EQ(
+      clipProperties->cssClip(),
+      fixedProperties->localBorderBoxProperties()->propertyTreeState.clip());
+  EXPECT_EQ(framePreTranslation(), fixedProperties->localBorderBoxProperties()
+                                       ->propertyTreeState.transform()
+                                       ->parent());
   EXPECT_EQ(TransformationMatrix().translate(654, 321),
             fixedProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.transform->matrix());
+                ->propertyTreeState.transform()
+                ->matrix());
   EXPECT_EQ(LayoutPoint(),
             fixedProperties->localBorderBoxProperties()->paintOffset);
   CHECK_VISUAL_RECT(
       LayoutRect(), fixed, document().view()->layoutView(),
       // TODO(crbug.com/599939): CSS clip of fixed-position descendants is broken in mapToVisualRectInAncestorSpace().
       LayoutUnit::max());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, CSSClipAbsPositionDescendant) {
   // This test verifies that clip tree hierarchy being generated correctly for the hard case
@@ skipping 33 matching lines @@
             clipProperties->cssClip()->clipRect());
   CHECK_VISUAL_RECT(
       absoluteClipRect, clip, document().view()->layoutView(),
       // TODO(crbug.com/599939): mapToVisualRectInAncestorSpace() doesn't apply css clip on the object itself.
       LayoutUnit::max());
 
   LayoutObject* absolute =
       document().getElementById("absolute")->layoutObject();
   const ObjectPaintProperties* absPosProperties =
       absolute->objectPaintProperties();
-  EXPECT_EQ(clipProperties->cssClip(),
-            absPosProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.clip);
+  EXPECT_EQ(
+      clipProperties->cssClip(),
+      absPosProperties->localBorderBoxProperties()->propertyTreeState.clip());
   EXPECT_EQ(framePreTranslation(), absPosProperties->localBorderBoxProperties()
-                                       ->geometryPropertyTreeState.transform);
+                                       ->propertyTreeState.transform());
   EXPECT_EQ(LayoutPoint(123, 456),
             absPosProperties->localBorderBoxProperties()->paintOffset);
   CHECK_VISUAL_RECT(
       LayoutRect(), absolute, document().view()->layoutView(),
       // TODO(crbug.com/599939): CSS clip of fixed-position descendants is broken in mapToVisualRectInAncestorSpace().
       LayoutUnit::max());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, CSSClipFixedPositionDescendantNonShared) {
   // This test is similar to CSSClipFixedPositionDescendant above, except that
@@ skipping 51 matching lines @@
   EXPECT_EQ(frameContentClip(),
             clipProperties->cssClipFixedPosition()->parent());
   EXPECT_EQ(overflowProperties->scrollTranslation(),
             clipProperties->cssClipFixedPosition()->localTransformSpace());
   EXPECT_EQ(FloatRoundedRect(FloatRect(absoluteClipRect)),
             clipProperties->cssClipFixedPosition()->clipRect());
   CHECK_EXACT_VISUAL_RECT(LayoutRect(), clip, document().view()->layoutView());
 
   LayoutObject* fixed = document().getElementById("fixed")->layoutObject();
   const ObjectPaintProperties* fixedProperties = fixed->objectPaintProperties();
-  EXPECT_EQ(clipProperties->cssClipFixedPosition(),
-            fixedProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.clip);
-  EXPECT_EQ(framePreTranslation(),
-            fixedProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.transform->parent());
+  EXPECT_EQ(
+      clipProperties->cssClipFixedPosition(),
+      fixedProperties->localBorderBoxProperties()->propertyTreeState.clip());
+  EXPECT_EQ(framePreTranslation(), fixedProperties->localBorderBoxProperties()
+                                       ->propertyTreeState.transform()
+                                       ->parent());
   EXPECT_EQ(TransformationMatrix().translate(654, 321),
             fixedProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.transform->matrix());
+                ->propertyTreeState.transform()
+                ->matrix());
   EXPECT_EQ(LayoutPoint(),
             fixedProperties->localBorderBoxProperties()->paintOffset);
   CHECK_VISUAL_RECT(
       LayoutRect(), fixed, document().view()->layoutView(),
       // TODO(crbug.com/599939): CSS clip of fixed-position descendants is broken in geometry mapping.
       LayoutUnit::max());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, ColumnSpannerUnderRelativePositioned) {
   setBodyInnerHTML(
@@ skipping 624 matching lines @@
   LayoutBoxModelObject* clipper = toLayoutBoxModelObject(
       document().getElementById("clipper")->layoutObject());
   const ObjectPaintProperties* clipProperties =
       clipper->objectPaintProperties();
   LayoutObject* child = document().getElementById("child")->layoutObject();
   const ObjectPaintProperties* childProperties = child->objectPaintProperties();
 
   // No scroll translation because the document does not scroll (not enough content).
   EXPECT_TRUE(!frameScrollTranslation());
   EXPECT_EQ(framePreTranslation(), clipProperties->localBorderBoxProperties()
-                                       ->geometryPropertyTreeState.transform);
-  EXPECT_EQ(frameContentClip(), clipProperties->localBorderBoxProperties()
-                                    ->geometryPropertyTreeState.clip);
+                                       ->propertyTreeState.transform());
+  EXPECT_EQ(
+      frameContentClip(),
+      clipProperties->localBorderBoxProperties()->propertyTreeState.clip());
 
-  GeometryPropertyTreeState contentsTreeState;
-  LayoutPoint paintOffsetFromContentsTreeState;
-  clipProperties->getContentsPropertyTreeState(
-      contentsTreeState, paintOffsetFromContentsTreeState);
-  EXPECT_EQ(LayoutPoint(30, 20), paintOffsetFromContentsTreeState);
-  EXPECT_EQ(framePreTranslation(), contentsTreeState.transform);
-  EXPECT_EQ(clipProperties->overflowClip(), contentsTreeState.clip);
+  auto contentsProperties = clipProperties->contentsProperties();
+  EXPECT_EQ(LayoutPoint(30, 20), contentsProperties.paintOffset);
+  EXPECT_EQ(framePreTranslation(),
+            contentsProperties.propertyTreeState.transform());
+  EXPECT_EQ(clipProperties->overflowClip(),
+            contentsProperties.propertyTreeState.clip());
 
   EXPECT_EQ(framePreTranslation(), childProperties->localBorderBoxProperties()
-                                       ->geometryPropertyTreeState.transform);
-  EXPECT_EQ(clipProperties->overflowClip(),
-            childProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.clip);
+                                       ->propertyTreeState.transform());
+  EXPECT_EQ(
+      clipProperties->overflowClip(),
+      childProperties->localBorderBoxProperties()->propertyTreeState.clip());
 
-  EXPECT_NE(nullptr, childProperties->localBorderBoxProperties()
-                         ->geometryPropertyTreeState.effect);
+  EXPECT_NE(
+      nullptr,
+      childProperties->localBorderBoxProperties()->propertyTreeState.effect());
   CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 500, 600), child, clipper);
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, ContainsPaintContentsTreeState) {
   setBodyInnerHTML(
       "<style>body { margin: 20px 30px; }</style>"
       "<div id='clipper' style='contain:paint; width:300px; height:200px;'>"
       "  <div id='child' style='position:relative; width:400px; height: "
       "500px;'></div>"
       "</div>");
 
   LayoutBoxModelObject* clipper = toLayoutBoxModelObject(
       document().getElementById("clipper")->layoutObject());
   const ObjectPaintProperties* clipProperties =
       clipper->objectPaintProperties();
   LayoutObject* child = document().getElementById("child")->layoutObject();
   const ObjectPaintProperties* childProperties = child->objectPaintProperties();
 
   // No scroll translation because the document does not scroll (not enough content).
   EXPECT_TRUE(!frameScrollTranslation());
   EXPECT_EQ(framePreTranslation(), clipProperties->localBorderBoxProperties()
-                                       ->geometryPropertyTreeState.transform);
-  EXPECT_EQ(frameContentClip(), clipProperties->localBorderBoxProperties()
-                                    ->geometryPropertyTreeState.clip);
+                                       ->propertyTreeState.transform());
+  EXPECT_EQ(
+      frameContentClip(),
+      clipProperties->localBorderBoxProperties()->propertyTreeState.clip());
 
-  GeometryPropertyTreeState contentsTreeState;
-  LayoutPoint paintOffsetFromContentsTreeState;
-  clipProperties->getContentsPropertyTreeState(
-      contentsTreeState, paintOffsetFromContentsTreeState);
-  EXPECT_EQ(LayoutPoint(30, 20), paintOffsetFromContentsTreeState);
-  EXPECT_EQ(framePreTranslation(), contentsTreeState.transform);
-  EXPECT_EQ(clipProperties->overflowClip(), contentsTreeState.clip);
+  auto contentsProperties = clipProperties->contentsProperties();
+  EXPECT_EQ(LayoutPoint(30, 20), contentsProperties.paintOffset);
+  EXPECT_EQ(framePreTranslation(),
+            contentsProperties.propertyTreeState.transform());
+  EXPECT_EQ(clipProperties->overflowClip(),
+            contentsProperties.propertyTreeState.clip());
 
   EXPECT_EQ(framePreTranslation(), childProperties->localBorderBoxProperties()
-                                       ->geometryPropertyTreeState.transform);
-  EXPECT_EQ(clipProperties->overflowClip(),
-            childProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.clip);
+                                       ->propertyTreeState.transform());
+  EXPECT_EQ(
+      clipProperties->overflowClip(),
+      childProperties->localBorderBoxProperties()->propertyTreeState.clip());
 
-  EXPECT_NE(nullptr, childProperties->localBorderBoxProperties()
-                         ->geometryPropertyTreeState.effect);
+  EXPECT_NE(
+      nullptr,
+      childProperties->localBorderBoxProperties()->propertyTreeState.effect());
   CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 400, 500), child, clipper);
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, OverflowScrollContentsTreeState) {
   // This test verifies the tree builder correctly computes and records the property tree context
   // for a (pseudo) stacking context that is scrolled by a containing block that is not one of
   // the painting ancestors.
   setBodyInnerHTML(
       "<style>body { margin: 20px 30px; }</style>"
       "<div id='clipper' style='overflow:scroll; width:400px; height:300px;'>"
       "  <div id='child' style='position:relative; width:500px; height: "
       "600px;'></div>"
       "  <div style='width: 200px; height: 10000px'></div>"
       "</div>"
       "<div id='forceScroll' style='height: 4000px;'></div>");
 
   Element* clipperElement = document().getElementById("clipper");
   clipperElement->scrollTo(1, 2);
 
   LayoutBoxModelObject* clipper =
       toLayoutBoxModelObject(clipperElement->layoutObject());
   const ObjectPaintProperties* clipProperties =
       clipper->objectPaintProperties();
   LayoutObject* child = document().getElementById("child")->layoutObject();
   const ObjectPaintProperties* childProperties = child->objectPaintProperties();
 
-  EXPECT_EQ(frameScrollTranslation(),
-            clipProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.transform);
-  EXPECT_EQ(frameContentClip(), clipProperties->localBorderBoxProperties()
-                                    ->geometryPropertyTreeState.clip);
+  EXPECT_EQ(frameScrollTranslation(), clipProperties->localBorderBoxProperties()
+                                          ->propertyTreeState.transform());
+  EXPECT_EQ(
+      frameContentClip(),
+      clipProperties->localBorderBoxProperties()->propertyTreeState.clip());
 
-  GeometryPropertyTreeState contentsTreeState;
-  LayoutPoint paintOffsetFromContentsTreeState;
-  clipProperties->getContentsPropertyTreeState(
-      contentsTreeState, paintOffsetFromContentsTreeState);
-  EXPECT_EQ(LayoutPoint(30, 20), paintOffsetFromContentsTreeState);
-  EXPECT_EQ(clipProperties->scrollTranslation(), contentsTreeState.transform);
-  EXPECT_EQ(clipProperties->overflowClip(), contentsTreeState.clip);
+  auto contentsProperties = clipProperties->contentsProperties();
+  EXPECT_EQ(LayoutPoint(30, 20), contentsProperties.paintOffset);
+  EXPECT_EQ(clipProperties->scrollTranslation(),
+            contentsProperties.propertyTreeState.transform());
+  EXPECT_EQ(clipProperties->overflowClip(),
+            contentsProperties.propertyTreeState.clip());
 
   EXPECT_EQ(clipProperties->scrollTranslation(),
             childProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.transform);
-  EXPECT_EQ(clipProperties->overflowClip(),
-            childProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.clip);
+                ->propertyTreeState.transform());
+  EXPECT_EQ(
+      clipProperties->overflowClip(),
+      childProperties->localBorderBoxProperties()->propertyTreeState.clip());
 
   CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 500, 600), child, clipper);
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, OverflowScrollWithRoundedRect) {
   setBodyInnerHTML(
       "<style>"
       "  * { margin: 0; }"
       "  ::-webkit-scrollbar {"
       "    width: 13px;"
@@ skipping 49 matching lines @@
 
   LayoutBoxModelObject* clipper = toLayoutBoxModelObject(
       document().getElementById("clipper")->layoutObject());
   const ObjectPaintProperties* clipProperties =
       clipper->objectPaintProperties();
   LayoutObject* child = document().getElementById("child")->layoutObject();
 
   // No scroll translation because the document does not scroll (not enough content).
   EXPECT_TRUE(!frameScrollTranslation());
   EXPECT_EQ(framePreTranslation(), clipProperties->localBorderBoxProperties()
-                                       ->geometryPropertyTreeState.transform);
+                                       ->propertyTreeState.transform());
   // CSS clip on an element causes it to clip itself, not just descendants.
+  EXPECT_EQ(
+      clipProperties->cssClip(),
+      clipProperties->localBorderBoxProperties()->propertyTreeState.clip());
+
+  auto contentsProperties = clipProperties->contentsProperties();
+  EXPECT_EQ(LayoutPoint(30, 20), contentsProperties.paintOffset);
+  EXPECT_EQ(framePreTranslation(),
+            contentsProperties.propertyTreeState.transform());
   EXPECT_EQ(clipProperties->cssClip(),
-            clipProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.clip);
-
-  GeometryPropertyTreeState contentsTreeState;
-  LayoutPoint paintOffsetFromContentsTreeState;
-  clipProperties->getContentsPropertyTreeState(
-      contentsTreeState, paintOffsetFromContentsTreeState);
-  EXPECT_EQ(LayoutPoint(30, 20), paintOffsetFromContentsTreeState);
-  EXPECT_EQ(framePreTranslation(), contentsTreeState.transform);
-  EXPECT_EQ(clipProperties->cssClip(), contentsTreeState.clip);
+            contentsProperties.propertyTreeState.clip());
 
   CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 400, 500), child, clipper);
 }
 
 TEST_P(PaintPropertyTreeBuilderTest,
        SvgLocalToBorderBoxTransformContentsTreeState) {
   setBodyInnerHTML(
       "<style>"
       "  body {"
       "    margin: 20px 30px;"
@@ skipping 10 matching lines @@
       "  <rect id='rect' width='100px' height='100px' />"
       "</svg>");
 
   LayoutObject& svgWithViewBox =
       *document().getElementById("svgWithViewBox")->layoutObject();
   const ObjectPaintProperties* svgWithViewBoxProperties =
       svgWithViewBox.objectPaintProperties();
 
   EXPECT_EQ(framePreTranslation(),
             svgWithViewBoxProperties->localBorderBoxProperties()
-                ->geometryPropertyTreeState.transform);
+                ->propertyTreeState.transform());
 
-  GeometryPropertyTreeState contentsTreeState;
-  LayoutPoint paintOffsetFromContentsTreeState;
-  svgWithViewBoxProperties->getContentsPropertyTreeState(
-      contentsTreeState, paintOffsetFromContentsTreeState);
-  EXPECT_EQ(LayoutPoint(), paintOffsetFromContentsTreeState);
+  auto contentsProperties = svgWithViewBoxProperties->contentsProperties();
+  EXPECT_EQ(LayoutPoint(), contentsProperties.paintOffset);
   EXPECT_EQ(svgWithViewBoxProperties->svgLocalToBorderBoxTransform(),
-            contentsTreeState.transform);
+            contentsProperties.propertyTreeState.transform());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, OverflowHiddenScrollProperties) {
   setBodyInnerHTML(
       "<style>"
       "  body {"
       "    margin: 0px;"
       "  }"
       "  #overflowHidden {"
       "    overflow: hidden;"
@@ skipping 474 matching lines @@
   EXPECT_FALSE(
       overflowB->layoutObject()
           ->objectPaintProperties()
           ->scroll()
           ->parent()
           ->hasMainThreadScrollingReasons(
               MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects));
 }
 
 }  // namespace blink