Switch RootLayerScrolls to use root transform and scroll properties

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 213 matching lines @@
 
 TEST_P(PaintPropertyTreeBuilderTest, FrameScrollingTraditional)
 {
     setBodyInnerHTML("<style> body { height: 10000px; } </style>");
 
     document().domWindow()->scrollTo(0, 100);
 
     FrameView* frameView = document().view();
     frameView->updateAllLifecyclePhases();
     EXPECT_EQ(TransformationMatrix(), framePreTranslation()->matrix());
-    if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled())
-        EXPECT_TRUE(framePreTranslation()->parent()->isRoot());
+    EXPECT_TRUE(framePreTranslation()->parent()->isRoot());
 
     EXPECT_EQ(TransformationMatrix().translate(0, -100), frameScrollTranslation()->matrix());
     EXPECT_EQ(framePreTranslation(), frameScrollTranslation()->parent());
     EXPECT_EQ(framePreTranslation(), frameContentClip()->localTransformSpace());
     EXPECT_EQ(FloatRoundedRect(0, 0, 800, 600), frameContentClip()->clipRect());
     EXPECT_TRUE(frameContentClip()->parent()->isRoot());
 
     LayoutViewItem layoutViewItem = document().layoutViewItem();
     const ObjectPaintProperties* layoutViewProperties = layoutViewItem.objectPaintProperties();
     // http://crbug.com/638415
     if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
         EXPECT_EQ(nullptr, layoutViewProperties->scrollTranslation());
         CHECK_EXACT_VISUAL_RECT(LayoutRect(8, 8, 784, 10000), document().body()->layoutObject(), frameView->layoutView());
     }
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, Perspective)
 {
     loadTestData("perspective.html");
 
     Element* perspective = document().getElementById("perspective");
     const ObjectPaintProperties* perspectiveProperties = perspective->layoutObject()->objectPaintProperties();
     EXPECT_EQ(TransformationMatrix().applyPerspective(100), perspectiveProperties->perspective()->matrix());
     // The perspective origin is the center of the border box plus accumulated paint offset.
     EXPECT_EQ(FloatPoint3D(250, 250, 0), perspectiveProperties->perspective()->origin());
-    EXPECT_EQ(frameScrollTranslation(), perspectiveProperties->perspective()->parent());
+    EXPECT_EQ(framePreTranslation(), perspectiveProperties->perspective()->parent());
 
     // Adding perspective doesn't clear paint offset. The paint offset will be passed down to children.
     Element* inner = document().getElementById("inner");
     const ObjectPaintProperties* innerProperties = inner->layoutObject()->objectPaintProperties();
     EXPECT_EQ(TransformationMatrix().translate(50, 100), innerProperties->paintOffsetTranslation()->matrix());
     EXPECT_EQ(perspectiveProperties->perspective(), innerProperties->paintOffsetTranslation()->parent());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(50, 100, 100, 200), inner->layoutObject(), document().view()->layoutView());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, Transform)
@@ skipping 13 matching lines @@
     }
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, RelativePositionInline)
 {
     loadTestData("relative-position-inline.html");
 
     Element* inlineBlock = document().getElementById("inline-block");
     const ObjectPaintProperties* inlineBlockProperties = inlineBlock->layoutObject()->objectPaintProperties();
     EXPECT_EQ(TransformationMatrix().translate(135, 490), inlineBlockProperties->paintOffsetTranslation()->matrix());
-    EXPECT_EQ(frameScrollTranslation(), inlineBlockProperties->paintOffsetTranslation()->parent());
+    EXPECT_EQ(framePreTranslation(), inlineBlockProperties->paintOffsetTranslation()->parent());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(135, 490, 10, 20), inlineBlock->layoutObject(), document().view()->layoutView());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, NestedOpacityEffect)
 {
     setBodyInnerHTML(
         "<div id='nodeWithoutOpacity' style='width: 100px; height: 200px'>"
         "  <div id='childWithOpacity' style='opacity: 0.5; width: 50px; height: 60px;'>"
         "    <div id='grandChildWithoutOpacity' style='width: 20px; height: 30px'>"
         "      <div id='greatGrandChildWithOpacity' style='opacity: 0.2; width: 10px; height: 15px'/>"
@@ skipping 198 matching lines @@
         "<svg id='svgRootWith3dTransform' width='100px' height='100px'>"
         "  <rect id='rectWith2dTransform' width='100px' height='100px' />"
         "</svg>");
 
     LayoutObject& svgRootWith3dTransform = *document().getElementById("svgRootWith3dTransform")->layoutObject();
     const ObjectPaintProperties* svgRootWith3dTransformProperties = svgRootWith3dTransform.objectPaintProperties();
     EXPECT_EQ(TransformationMatrix().translate3d(1, 2, 3), svgRootWith3dTransformProperties->transform()->matrix());
     EXPECT_EQ(FloatPoint3D(50, 50, 0), svgRootWith3dTransformProperties->transform()->origin());
     EXPECT_EQ(svgRootWith3dTransformProperties->paintOffsetTranslation(), svgRootWith3dTransformProperties->transform()->parent());
     EXPECT_EQ(TransformationMatrix().translate(70, 25), svgRootWith3dTransformProperties->paintOffsetTranslation()->matrix());
-    EXPECT_EQ(frameScrollTranslation(), svgRootWith3dTransformProperties->paintOffsetTranslation()->parent());
+    EXPECT_EQ(framePreTranslation(), svgRootWith3dTransformProperties->paintOffsetTranslation()->parent());
 
     LayoutObject& rectWith2dTransform = *document().getElementById("rectWith2dTransform")->layoutObject();
     const ObjectPaintProperties* rectWith2dTransformProperties = rectWith2dTransform.objectPaintProperties();
     TransformationMatrix matrix;
     matrix.translate(100, 100);
     matrix.rotate(45);
     // SVG's transform origin is baked into the transform.
     matrix.applyTransformOrigin(50, 25, 0);
     EXPECT_EQ(matrix, rectWith2dTransformProperties->transform()->matrix());
     EXPECT_EQ(FloatPoint3D(0, 0, 0), rectWith2dTransformProperties->transform()->origin());
@@ skipping 36 matching lines @@
 {
     setBodyInnerHTML(
         "<style>body { margin: 0px; } </style>"
         "<svg id='svg' style='margin-left: 50px; margin-top: 25px; width: 100px; height: 100px;' />");
 
     LayoutObject& svg = *document().getElementById("svg")->layoutObject();
     const ObjectPaintProperties* svgProperties = svg.objectPaintProperties();
     // Ensure that a paint offset transform is not unnecessarily emitted.
     EXPECT_EQ(nullptr, svgProperties->paintOffsetTranslation());
     EXPECT_EQ(TransformationMatrix().translate(50, 25), svgProperties->svgLocalToBorderBoxTransform()->matrix());
-    EXPECT_EQ(frameScrollTranslation(), svgProperties->svgLocalToBorderBoxTransform()->parent());
+    EXPECT_EQ(framePreTranslation(), svgProperties->svgLocalToBorderBoxTransform()->parent());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, SVGRootLocalToBorderBoxTransformNode)
 {
     setBodyInnerHTML(
         "<style>"
         "  body { margin: 0px; }"
         "  svg { margin-left: 2px; margin-top: 3px; transform: translate(5px, 7px); border: 11px solid green; }"
         "</style>"
         "<svg id='svg' width='100px' height='100px' viewBox='0 0 13 13'>"
@@ skipping 104 matching lines @@
         "  }"
         "  input {"
         "    border-width: 5px;"
         "    padding: 0;"
         "  }"
         "</style>"
         "<input id='button' type='button' style='width:345px; height:123px' value='some text'/>");
 
     LayoutObject& button = *document().getElementById("button")->layoutObject();
     const ObjectPaintProperties* buttonProperties = button.objectPaintProperties();
-    EXPECT_EQ(frameScrollTranslation(), buttonProperties->overflowClip()->localTransformSpace());
+    // No scroll translation because the document does not scroll (not enough content).
+    EXPECT_TRUE(!frameScrollTranslation());
+    EXPECT_EQ(framePreTranslation(), buttonProperties->overflowClip()->localTransformSpace());
     EXPECT_EQ(FloatRoundedRect(5, 5, 335, 113), buttonProperties->overflowClip()->clipRect());
     EXPECT_EQ(frameContentClip(), buttonProperties->overflowClip()->parent());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 345, 123), &button, document().view()->layoutView());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, BorderRadiusClip)
 {
     setBodyInnerHTML(
         "<style>"
         " body {"
         "   margin: 0px;"
         " }"
         " #div {"
         "   border-radius: 12px 34px 56px 78px;"
         "   border-top: 45px solid;"
         "   border-right: 50px solid;"
         "   border-bottom: 55px solid;"
         "   border-left: 60px solid;"
         "   width: 500px;"
         "   height: 400px;"
         "   overflow: scroll;"
         " }"
         "</style>"
         "<div id='div'></div>");
 
     LayoutObject& div = *document().getElementById("div")->layoutObject();
     const ObjectPaintProperties* divProperties = div.objectPaintProperties();
-    EXPECT_EQ(frameScrollTranslation(), divProperties->overflowClip()->localTransformSpace());
+    // No scroll translation because the document does not scroll (not enough content).
+    EXPECT_TRUE(!frameScrollTranslation());
+    EXPECT_EQ(framePreTranslation(), divProperties->overflowClip()->localTransformSpace());
     // The overflow clip rect includes only the padding box.
     // padding box = border box(500+60+50, 400+45+55) - border outset(60+50, 45+55) - scrollbars(15, 15)
     EXPECT_EQ(FloatRoundedRect(60, 45, 500, 400), divProperties->overflowClip()->clipRect());
     const ClipPaintPropertyNode* borderRadiusClip = divProperties->overflowClip()->parent();
-    EXPECT_EQ(frameScrollTranslation(), borderRadiusClip->localTransformSpace());
+    EXPECT_EQ(framePreTranslation(), borderRadiusClip->localTransformSpace());
     // The border radius clip is the area enclosed by inner border edge, including the scrollbars.
     // As the border-radius is specified in outer radius, the inner radius is calculated by:
     // inner radius = max(outer radius - border width, 0)
     // In the case that two adjacent borders have different width, the inner radius of the corner
     // may transition from one value to the other. i.e. being an ellipse.
     EXPECT_EQ(
         FloatRoundedRect(
             FloatRect(60, 45, 500, 400), // = border box(610, 500) - border outset(110, 100)
             FloatSize(0, 0), //   (top left)     = max((12, 12) - (60, 45), (0, 0))
             FloatSize(0, 0), //   (top right)    = max((34, 34) - (50, 45), (0, 0))
@@ skipping 175 matching lines @@
         "<table>"
         "  <tr><td></td><td></td></tr>"
         "  <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(frameScrollTranslation(), targetProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
+    EXPECT_EQ(framePreTranslation(), targetProperties->localBorderBoxProperties()->geometryPropertyTreeState.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 14 matching lines @@
         "</style>"
         "<div id='clip'><div id='fixed'></div></div>"
     );
     LayoutRect localClipRect(40, 10, 40, 60);
     LayoutRect absoluteClipRect = localClipRect;
     absoluteClipRect.move(123, 456);
 
     LayoutObject& clip = *document().getElementById("clip")->layoutObject();
     const ObjectPaintProperties* clipProperties = clip.objectPaintProperties();
     EXPECT_EQ(frameContentClip(), clipProperties->cssClip()->parent());
-    EXPECT_EQ(frameScrollTranslation(), clipProperties->cssClip()->localTransformSpace());
+    EXPECT_EQ(framePreTranslation(), 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(TransformationMatrix().translate(654, 321), fixedProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform->matrix());
@@ skipping 20 matching lines @@
         "  #abs {"
         "    position: absolute;"
         "    left: 654px;"
         "    top: 321px;"
         "    width: 10px;"
         "    heght: 20px"
         "  }"
         "</style>"
         "<div id='clip'><div id='absolute'></div></div>"
     );
+
     LayoutRect localClipRect(40, 10, 40, 60);
     LayoutRect absoluteClipRect = localClipRect;
     absoluteClipRect.move(123, 456);
 
     LayoutObject* clip = document().getElementById("clip")->layoutObject();
     const ObjectPaintProperties* clipProperties = clip->objectPaintProperties();
     EXPECT_EQ(frameContentClip(), clipProperties->cssClip()->parent());
-    EXPECT_EQ(frameScrollTranslation(), clipProperties->cssClip()->localTransformSpace());
+    // No scroll translation because the document does not scroll (not enough content).
+    EXPECT_TRUE(!frameScrollTranslation());
+    EXPECT_EQ(framePreTranslation(), 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* absolute = document().getElementById("absolute")->layoutObject();
     const ObjectPaintProperties* absPosProperties = absolute->objectPaintProperties();
     EXPECT_EQ(clipProperties->cssClip(), absPosProperties->localBorderBoxProperties()->geometryPropertyTreeState.clip);
-    EXPECT_EQ(framePreTranslation(), absPosProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform->parent());
+    EXPECT_EQ(framePreTranslation(), absPosProperties->localBorderBoxProperties()->geometryPropertyTreeState.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
     // now we have a parent overflow clip that should be escaped by the fixed descendant.
@@ skipping 24 matching lines @@
         "</style>"
         "<div id='overflow'><div id='clip'><div id='fixed'></div></div></div>"
     );
     LayoutRect localClipRect(40, 10, 40, 60);
     LayoutRect absoluteClipRect = localClipRect;
     absoluteClipRect.move(123, 456);
 
     LayoutObject& overflow = *document().getElementById("overflow")->layoutObject();
     const ObjectPaintProperties* overflowProperties = overflow.objectPaintProperties();
     EXPECT_EQ(frameContentClip(), overflowProperties->overflowClip()->parent());
-    EXPECT_EQ(frameScrollTranslation(), overflowProperties->scrollTranslation()->parent());
+    // No scroll translation because the document does not scroll (not enough content).
+    EXPECT_TRUE(!frameScrollTranslation());
+    EXPECT_EQ(framePreTranslation(), overflowProperties->scrollTranslation()->parent());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 50, 50), &overflow, document().view()->layoutView());
 
     LayoutObject* clip = document().getElementById("clip")->layoutObject();
     const ObjectPaintProperties* clipProperties = clip->objectPaintProperties();
     EXPECT_EQ(overflowProperties->overflowClip(), clipProperties->cssClip()->parent());
     EXPECT_EQ(overflowProperties->scrollTranslation(), clipProperties->cssClip()->localTransformSpace());
     EXPECT_EQ(FloatRoundedRect(FloatRect(absoluteClipRect)), clipProperties->cssClip()->clipRect());
     EXPECT_EQ(frameContentClip(), clipProperties->cssClipFixedPosition()->parent());
     EXPECT_EQ(overflowProperties->scrollTranslation(), clipProperties->cssClipFixedPosition()->localTransformSpace());
     EXPECT_EQ(FloatRoundedRect(FloatRect(absoluteClipRect)), clipProperties->cssClipFixedPosition()->clipRect());
@@ skipping 543 matching lines @@
         "<div id='clipper' style='overflow:hidden; width:400px; height:300px;'>"
         "  <div id='child' style='position:relative; width:500px; height: 600px;'></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();
 
-    EXPECT_EQ(frameScrollTranslation(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
+    // 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);
 
     GeometryPropertyTreeState contentsProperties;
     clipProperties->getContentsProperties(contentsProperties);
-    EXPECT_EQ(frameScrollTranslation(), contentsProperties.transform);
+    EXPECT_EQ(framePreTranslation(), contentsProperties.transform);
     EXPECT_EQ(clipProperties->overflowClip(), contentsProperties.clip);
 
-    EXPECT_EQ(frameScrollTranslation(), childProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
+    EXPECT_EQ(framePreTranslation(), childProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
     EXPECT_EQ(clipProperties->overflowClip(), childProperties->localBorderBoxProperties()->geometryPropertyTreeState.clip);
 
     EXPECT_NE(nullptr, childProperties->localBorderBoxProperties()->geometryPropertyTreeState.effect);
     CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 500, 600), child, clipper);
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, OverflowScrollContentsProperties)
 {
     // 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: 0; }</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 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();
 
@@ skipping 20 matching lines @@
         "<style>body { margin: 0; }</style>"
         "<div id='clipper' style='position: absolute; clip: rect(10px, 80px, 70px, 40px); width:400px; height:300px;'>"
         "  <div id='child' style='position:relative; width:500px; height: 600px;'></div>"
         "</div>"
     );
 
     LayoutBoxModelObject* clipper = toLayoutBoxModelObject(document().getElementById("clipper")->layoutObject());
     const ObjectPaintProperties* clipProperties = clipper->objectPaintProperties();
     LayoutObject* child = document().getElementById("child")->layoutObject();
 
-    EXPECT_EQ(frameScrollTranslation(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
+    // No scroll translation because the document does not scroll (not enough content).
+    EXPECT_TRUE(!frameScrollTranslation());
+    EXPECT_EQ(framePreTranslation(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
     // CSS clip on an element causes it to clip itself, not just descendants.
     EXPECT_EQ(clipProperties->cssClip(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.clip);
 
     GeometryPropertyTreeState contentsProperties;
     clipProperties->getContentsProperties(contentsProperties);
-    EXPECT_EQ(frameScrollTranslation(), contentsProperties.transform);
+    EXPECT_EQ(framePreTranslation(), contentsProperties.transform);
     EXPECT_EQ(clipProperties->cssClip(), contentsProperties.clip);
 
     CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 500, 600), child, clipper);
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, SvgLocalToBorderBoxTransformContentsProperties)
 {
     setBodyInnerHTML(
         "<style>"
         "  body {"
         "    margin: 0px;"
         "  }"
         "  svg {"
         "    position: absolute;"
         "  }"
         "  rect {"
         "    transform: translate(100px, 100px);"
         "  }"
         "</style>"
         "<svg id='svgWithViewBox' width='100px' height='100px' viewBox='50 50 100 100'>"
         "  <rect id='rect' width='100px' height='100px' />"
         "</svg>");
 
     LayoutObject& svgWithViewBox = *document().getElementById("svgWithViewBox")->layoutObject();
     const ObjectPaintProperties* svgWithViewBoxProperties = svgWithViewBox.objectPaintProperties();
 
-    EXPECT_EQ(frameScrollTranslation(), svgWithViewBoxProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
+    EXPECT_EQ(framePreTranslation(), svgWithViewBoxProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
 
     GeometryPropertyTreeState contentsProperties;
     svgWithViewBoxProperties->getContentsProperties(contentsProperties);
     EXPECT_EQ(svgWithViewBoxProperties->svgLocalToBorderBoxTransform(), contentsProperties.transform);
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, OverflowHiddenScrollProperties)
 {
     setBodyInnerHTML(
         "<style>"
@@ skipping 370 matching lines @@
 
     // Removing a main thread scrolling reason should update the entire tree.
     overflowB->removeAttribute("class");
     document().view()->updateAllLifecyclePhases();
     EXPECT_FALSE(overflowA->layoutObject()->objectPaintProperties()->scroll()->hasMainThreadScrollingReasons(MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects));
     EXPECT_FALSE(overflowB->layoutObject()->objectPaintProperties()->scroll()->hasMainThreadScrollingReasons(MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects));
     EXPECT_FALSE(overflowB->layoutObject()->objectPaintProperties()->scroll()->parent()->hasMainThreadScrollingReasons(MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects));
 }
 
 } // namespace blink