Switch to null root property tree nodes [spv2]

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 22 matching lines @@
 
     void loadTestData(const char* fileName)
     {
         String fullPath = testing::blinkRootDir();
         fullPath.append("/Source/core/paint/test_data/");
         fullPath.append(fileName);
         RefPtr<SharedBuffer> inputBuffer = testing::readFromFile(fullPath);
         setBodyInnerHTML(String(inputBuffer->data(), inputBuffer->size()));
     }
 
-    const TransformPaintPropertyNode* rootTransform()
-    {
-        FrameView* frameView = document().view();
-        if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
-            return frameView->layoutView()->objectPaintProperties()->paintOffsetTranslation();
-        return frameView->rootTransform();
-    }
-
-    const ClipPaintPropertyNode* rootClip()
-    {
-        if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
-            return document().view()->layoutView()->objectPaintProperties()->localBorderBoxProperties()->geometryPropertyTreeState.clip.get();
-        return document().view()->rootClip();
-    }
-
-    const ScrollPaintPropertyNode* rootScroll()
-    {
-        FrameView* frameView = document().view();
-        if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
-            return frameView->layoutView()->objectPaintProperties()->scroll();
-        return frameView->rootScroll();
-    }
-
     const TransformPaintPropertyNode* framePreTranslation()
     {
         FrameView* frameView = document().view();
         if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
             return frameView->layoutView()->objectPaintProperties()->paintOffsetTranslation();
         return frameView->preTranslation();
     }
 
     const TransformPaintPropertyNode* frameScrollTranslation()
     {
@@ skipping 87 matching lines @@
     Element* target1 = document().getElementById("target1");
     const ObjectPaintProperties* target1Properties = target1->layoutObject()->objectPaintProperties();
     EXPECT_EQ(TransformationMatrix().translate(200, 150), target1Properties->paintOffsetTranslation()->matrix());
     EXPECT_EQ(framePreTranslation(), target1Properties->paintOffsetTranslation()->parent());
     EXPECT_EQ(target1Properties->paintOffsetTranslation(), target1Properties->overflowClip()->localTransformSpace());
     EXPECT_EQ(FloatRoundedRect(0, 0, 100, 100), target1Properties->overflowClip()->clipRect());
     // Likewise, it inherits clip from the viewport, skipping overflow clip of the scroller.
     EXPECT_EQ(frameContentClip(), target1Properties->overflowClip()->parent());
     // target1 should not have it's own scroll node and instead should inherit positionedScroll's.
     const ObjectPaintProperties* positionedScrollProperties = positionedScroll->layoutObject()->objectPaintProperties();
-    EXPECT_EQ(rootScroll(), positionedScrollProperties->scroll()->parent());
+    EXPECT_EQ(nullptr, positionedScrollProperties->scroll()->parent());
     EXPECT_EQ(TransformationMatrix().translate(0, -3), positionedScrollProperties->scroll()->scrollOffsetTranslation()->matrix());
     EXPECT_EQ(nullptr, target1Properties->scroll());
 
     CHECK_EXACT_VISUAL_RECT(LayoutRect(200, 150, 100, 100), target1->layoutObject(), frameView->layoutView());
 
     // target2 is a fixed-position element inside a transformed scrolling element.
     // It should be attached under the scrolled box of the transformed element.
     Element* target2 = document().getElementById("target2");
     const ObjectPaintProperties* target2Properties = target2->layoutObject()->objectPaintProperties();
     Element* scroller = document().getElementById("transformedScroll");
     const ObjectPaintProperties* scrollerProperties = scroller->layoutObject()->objectPaintProperties();
     EXPECT_EQ(TransformationMatrix().translate(200, 150), target2Properties->paintOffsetTranslation()->matrix());
     EXPECT_EQ(scrollerProperties->scrollTranslation(), target2Properties->paintOffsetTranslation()->parent());
     EXPECT_EQ(target2Properties->paintOffsetTranslation(), target2Properties->overflowClip()->localTransformSpace());
     EXPECT_EQ(FloatRoundedRect(0, 0, 100, 100), target2Properties->overflowClip()->clipRect());
     EXPECT_EQ(scrollerProperties->overflowClip(), target2Properties->overflowClip()->parent());
     // target2 should not have it's own scroll node and instead should inherit transformedScroll's.
     const ObjectPaintProperties* transformedScrollProperties = transformedScroll->layoutObject()->objectPaintProperties();
-    EXPECT_EQ(rootScroll(), transformedScrollProperties->scroll()->parent());
+    EXPECT_EQ(nullptr, transformedScrollProperties->scroll()->parent());
     EXPECT_EQ(TransformationMatrix().translate(0, -5), transformedScrollProperties->scroll()->scrollOffsetTranslation()->matrix());
     EXPECT_EQ(nullptr, target2Properties->scroll());
 
     CHECK_EXACT_VISUAL_RECT(LayoutRect(208, 153, 200, 100), target2->layoutObject(), frameView->layoutView());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, PositionAndScroll)
 {
     loadTestData("position-and-scroll.html");
 
@@ skipping 45 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_EQ(rootTransform(), framePreTranslation()->parent());
-    EXPECT_EQ(nullptr, rootTransform()->parent());
+        EXPECT_EQ(nullptr, framePreTranslation()->parent());
     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_EQ(rootClip(), frameContentClip()->parent());
-    if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled())
-        EXPECT_EQ(nullptr, rootClip()->parent());
+    EXPECT_EQ(nullptr, frameContentClip()->parent());
 
     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'/>"
         "    </div>"
         "  </div>"
         "</div>");
 
     LayoutObject* nodeWithoutOpacity = document().getElementById("nodeWithoutOpacity")->layoutObject();
     const ObjectPaintProperties* nodeWithoutOpacityProperties = nodeWithoutOpacity->objectPaintProperties();
     EXPECT_NE(nullptr, nodeWithoutOpacityProperties);
     CHECK_EXACT_VISUAL_RECT(LayoutRect(8, 8, 100, 200), nodeWithoutOpacity, document().view()->layoutView());
 
     LayoutObject* childWithOpacity = document().getElementById("childWithOpacity")->layoutObject();
     const ObjectPaintProperties* childWithOpacityProperties = childWithOpacity->objectPaintProperties();
     EXPECT_EQ(0.5f, childWithOpacityProperties->effect()->opacity());
     // childWithOpacity is the root effect node.
-    EXPECT_NE(nullptr, childWithOpacityProperties->effect()->parent());
+    EXPECT_EQ(nullptr, childWithOpacityProperties->effect()->parent());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(8, 8, 50, 60), childWithOpacity, document().view()->layoutView());
 
     LayoutObject* grandChildWithoutOpacity = document().getElementById("grandChildWithoutOpacity")->layoutObject();
     EXPECT_NE(nullptr, grandChildWithoutOpacity->objectPaintProperties());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(8, 8, 20, 30), grandChildWithoutOpacity, document().view()->layoutView());
 
     LayoutObject* greatGrandChildWithOpacity = document().getElementById("greatGrandChildWithOpacity")->layoutObject();
     const ObjectPaintProperties* greatGrandChildWithOpacityProperties = greatGrandChildWithOpacity->objectPaintProperties();
     EXPECT_EQ(0.2f, greatGrandChildWithOpacityProperties->effect()->opacity());
     EXPECT_EQ(childWithOpacityProperties->effect(), greatGrandChildWithOpacityProperties->effect()->parent());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(8, 8, 10, 15), greatGrandChildWithOpacity, document().view()->layoutView());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, TransformNodeDoesNotAffectEffectNodes)
 {
     setBodyInnerHTML(
         "<div id='nodeWithOpacity' style='opacity: 0.6' style='width: 100px; height: 200px'>"
         "  <div id='childWithTransform' style='transform: translate3d(10px, 10px, 0px); width: 50px; height: 60px;'>"
         "    <div id='grandChildWithOpacity' style='opacity: 0.4; width: 20px; height: 30px'/>"
         "  </div>"
         "</div>");
 
     LayoutObject* nodeWithOpacity = document().getElementById("nodeWithOpacity")->layoutObject();
     const ObjectPaintProperties* nodeWithOpacityProperties = nodeWithOpacity->objectPaintProperties();
     EXPECT_EQ(0.6f, nodeWithOpacityProperties->effect()->opacity());
-    EXPECT_NE(nullptr, nodeWithOpacityProperties->effect()->parent());
+    EXPECT_EQ(nullptr, nodeWithOpacityProperties->effect()->parent());
     EXPECT_EQ(nullptr, nodeWithOpacityProperties->transform());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(8, 8, 784, 60), nodeWithOpacity, document().view()->layoutView());
 
     LayoutObject* childWithTransform = document().getElementById("childWithTransform")->layoutObject();
     const ObjectPaintProperties* childWithTransformProperties = childWithTransform->objectPaintProperties();
     EXPECT_EQ(nullptr, childWithTransformProperties->effect());
     EXPECT_EQ(TransformationMatrix().translate(10, 10), childWithTransformProperties->transform()->matrix());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(18, 18, 50, 60), childWithTransform, document().view()->layoutView());
 
     LayoutObject* grandChildWithOpacity = document().getElementById("grandChildWithOpacity")->layoutObject();
     const ObjectPaintProperties* grandChildWithOpacityProperties = grandChildWithOpacity->objectPaintProperties();
     EXPECT_EQ(0.4f, grandChildWithOpacityProperties->effect()->opacity());
     EXPECT_EQ(nodeWithOpacityProperties->effect(), grandChildWithOpacityProperties->effect()->parent());
     EXPECT_EQ(nullptr, grandChildWithOpacityProperties->transform());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(18, 18, 20, 30), grandChildWithOpacity, document().view()->layoutView());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, EffectNodesAcrossStackingContext)
 {
     setBodyInnerHTML(
         "<div id='nodeWithOpacity' style='opacity: 0.6; width: 100px; height: 200px'>"
         "  <div id='childWithStackingContext' style='position:absolute; width: 50px; height: 60px;'>"
         "    <div id='grandChildWithOpacity' style='opacity: 0.4; width: 20px; height: 30px'/>"
         "  </div>"
         "</div>");
 
     LayoutObject* nodeWithOpacity = document().getElementById("nodeWithOpacity")->layoutObject();
     const ObjectPaintProperties* nodeWithOpacityProperties = nodeWithOpacity->objectPaintProperties();
     EXPECT_EQ(0.6f, nodeWithOpacityProperties->effect()->opacity());
-    EXPECT_NE(nullptr, nodeWithOpacityProperties->effect()->parent());
+    EXPECT_EQ(nullptr, nodeWithOpacityProperties->effect()->parent());
     EXPECT_EQ(nullptr, nodeWithOpacityProperties->transform());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(8, 8, 100, 200), nodeWithOpacity, document().view()->layoutView());
 
     LayoutObject* childWithStackingContext = document().getElementById("childWithStackingContext")->layoutObject();
     const ObjectPaintProperties* childWithStackingContextProperties = childWithStackingContext->objectPaintProperties();
     EXPECT_EQ(nullptr, childWithStackingContextProperties->effect());
     EXPECT_EQ(nullptr, childWithStackingContextProperties->transform());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(8, 8, 50, 60), childWithStackingContext, document().view()->layoutView());
 
     LayoutObject* grandChildWithOpacity = document().getElementById("grandChildWithOpacity")->layoutObject();
@@ skipping 13 matching lines @@
         "    <rect id='rectWithOpacity' opacity='0.4' />"
         "    <text id='textWithOpacity' opacity='0.2'>"
         "      <tspan id='tspanWithOpacity' opacity='0.1' />"
         "    </text>"
         "  </g>"
         "</svg>");
 
     LayoutObject* groupWithOpacity = document().getElementById("groupWithOpacity")->layoutObject();
     const ObjectPaintProperties* groupWithOpacityProperties = groupWithOpacity->objectPaintProperties();
     EXPECT_EQ(0.6f, groupWithOpacityProperties->effect()->opacity());
-    EXPECT_NE(nullptr, groupWithOpacityProperties->effect()->parent());
+    EXPECT_EQ(nullptr, groupWithOpacityProperties->effect()->parent());
 
     LayoutObject& rectWithoutOpacity = *document().getElementById("rectWithoutOpacity")->layoutObject();
     const ObjectPaintProperties* rectWithoutOpacityProperties = rectWithoutOpacity.objectPaintProperties();
     EXPECT_EQ(nullptr, rectWithoutOpacityProperties);
 
     LayoutObject& rectWithOpacity = *document().getElementById("rectWithOpacity")->layoutObject();
     const ObjectPaintProperties* rectWithOpacityProperties = rectWithOpacity.objectPaintProperties();
     EXPECT_EQ(0.4f, rectWithOpacityProperties->effect()->opacity());
     EXPECT_EQ(groupWithOpacityProperties->effect(), rectWithOpacityProperties->effect()->parent());
 
@@ skipping 15 matching lines @@
     setBodyInnerHTML(
         "<div id='divWithOpacity' style='opacity: 0.2;'>"
         "  <svg id='svgRootWithOpacity' style='opacity: 0.3;'>"
         "    <rect id='rectWithOpacity' opacity='0.4' />"
         "  </svg>"
         "</div>");
 
     LayoutObject& divWithOpacity = *document().getElementById("divWithOpacity")->layoutObject();
     const ObjectPaintProperties* divWithOpacityProperties = divWithOpacity.objectPaintProperties();
     EXPECT_EQ(0.2f, divWithOpacityProperties->effect()->opacity());
-    EXPECT_NE(nullptr, divWithOpacityProperties->effect()->parent());
+    EXPECT_EQ(nullptr, divWithOpacityProperties->effect()->parent());
 
     LayoutObject& svgRootWithOpacity = *document().getElementById("svgRootWithOpacity")->layoutObject();
     const ObjectPaintProperties* svgRootWithOpacityProperties = svgRootWithOpacity.objectPaintProperties();
     EXPECT_EQ(0.3f, svgRootWithOpacityProperties->effect()->opacity());
     EXPECT_EQ(divWithOpacityProperties->effect(), svgRootWithOpacityProperties->effect()->parent());
 
     LayoutObject& rectWithOpacity = *document().getElementById("rectWithOpacity")->layoutObject();
     const ObjectPaintProperties* rectWithOpacityProperties = rectWithOpacity.objectPaintProperties();
     EXPECT_EQ(0.4f, rectWithOpacityProperties->effect()->opacity());
     EXPECT_EQ(svgRootWithOpacityProperties->effect(), rectWithOpacityProperties->effect()->parent());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, EffectNodesAcrossSVGHTMLBoundary)
 {
     setBodyInnerHTML(
         "<svg id='svgRootWithOpacity' style='opacity: 0.3;'>"
         "  <foreignObject id='foreignObjectWithOpacity' opacity='0.4'>"
         "    <body>"
         "      <span id='spanWithOpacity' style='opacity: 0.5'/>"
         "    </body>"
         "  </foreignObject>"
         "</svg>");
 
     LayoutObject& svgRootWithOpacity = *document().getElementById("svgRootWithOpacity")->layoutObject();
     const ObjectPaintProperties* svgRootWithOpacityProperties = svgRootWithOpacity.objectPaintProperties();
     EXPECT_EQ(0.3f, svgRootWithOpacityProperties->effect()->opacity());
-    EXPECT_NE(nullptr, svgRootWithOpacityProperties->effect()->parent());
+    EXPECT_EQ(nullptr, svgRootWithOpacityProperties->effect()->parent());
 
     LayoutObject& foreignObjectWithOpacity = *document().getElementById("foreignObjectWithOpacity")->layoutObject();
     const ObjectPaintProperties* foreignObjectWithOpacityProperties = foreignObjectWithOpacity.objectPaintProperties();
     EXPECT_EQ(0.4f, foreignObjectWithOpacityProperties->effect()->opacity());
     EXPECT_EQ(svgRootWithOpacityProperties->effect(), foreignObjectWithOpacityProperties->effect()->parent());
 
     LayoutObject& spanWithOpacity = *document().getElementById("spanWithOpacity")->layoutObject();
     const ObjectPaintProperties* spanWithOpacityProperties = spanWithOpacity.objectPaintProperties();
     EXPECT_EQ(0.5f, spanWithOpacityProperties->effect()->opacity());
     EXPECT_EQ(foreignObjectWithOpacityProperties->effect(), spanWithOpacityProperties->effect()->parent());
@@ skipping 21 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());
+    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());
+    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 106 matching lines @@
     );
     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->scrollTranslation(), childProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
-    EXPECT_NE(nullptr, childProperties->localBorderBoxProperties()->geometryPropertyTreeState.effect);
+    EXPECT_EQ(nullptr, childProperties->localBorderBoxProperties()->geometryPropertyTreeState.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).
 
@@ skipping 48 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 27 matching lines @@
         "</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());
+    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(nullptr, absPosProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform->parent());
     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());
+    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);
+    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);
+    EXPECT_EQ(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>"
     );
 
     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(framePreTranslation(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
     EXPECT_EQ(frameContentClip(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.clip);
 
     GeometryPropertyTreeState contentsProperties;
     clipProperties->getContentsProperties(contentsProperties);
     EXPECT_EQ(clipProperties->scrollTranslation(), contentsProperties.transform);
     EXPECT_EQ(clipProperties->overflowClip(), contentsProperties.clip);
 
     EXPECT_EQ(clipProperties->scrollTranslation(), childProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
     EXPECT_EQ(clipProperties->overflowClip(), childProperties->localBorderBoxProperties()->geometryPropertyTreeState.clip);
 
     CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 500, 600), child, clipper);
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, CssClipContentsProperties)
 {
     // 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='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);
+    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 13 matching lines @@
         "  <div class='forceScroll'></div>"
         "</div>");
 
     Element* overflowHidden = document().getElementById("overflowHidden");
     overflowHidden->setScrollTop(37);
 
     document().view()->updateAllLifecyclePhases();
 
     const ObjectPaintProperties* overflowHiddenScrollProperties = overflowHidden->layoutObject()->objectPaintProperties();
     // Because the frameView is does not scroll, overflowHidden's scroll should be under the root.
-    EXPECT_EQ(rootScroll(), overflowHiddenScrollProperties->scroll()->parent());
+    EXPECT_EQ(nullptr, overflowHiddenScrollProperties->scroll()->parent());
     EXPECT_EQ(TransformationMatrix().translate(0, -37), overflowHiddenScrollProperties->scroll()->scrollOffsetTranslation()->matrix());
     // This should match the overflow's dimensions.
     EXPECT_EQ(IntSize(5, 3), overflowHiddenScrollProperties->scroll()->clip());
     // The scrolling content's bounds should include both the overflow's dimensions (5x3) and the
     // 0x79 "forceScroll" object.
     EXPECT_EQ(IntSize(5, 79), overflowHiddenScrollProperties->scroll()->bounds());
     // Although overflow: hidden is programmatically scrollable, it is not user scrollable.
     EXPECT_FALSE(overflowHiddenScrollProperties->scroll()->userScrollableHorizontal());
     EXPECT_FALSE(overflowHiddenScrollProperties->scroll()->userScrollableVertical());
 }
@@ skipping 27 matching lines @@
         "</div>");
 
     Element* overflowA = document().getElementById("overflowA");
     overflowA->setScrollTop(37);
     Element* overflowB = document().getElementById("overflowB");
     overflowB->setScrollTop(41);
 
     document().view()->updateAllLifecyclePhases();
 
     const ObjectPaintProperties* overflowAScrollProperties = overflowA->layoutObject()->objectPaintProperties();
-    // Because the frameView is does not scroll, overflowA's scroll should be under the root.
-    EXPECT_EQ(rootScroll(), overflowAScrollProperties->scroll()->parent());
+    // Because the frameView is does not scroll, overflowA's scroll should be a root node.
+    EXPECT_EQ(nullptr, overflowAScrollProperties->scroll()->parent());
     EXPECT_EQ(TransformationMatrix().translate(0, -37), overflowAScrollProperties->scroll()->scrollOffsetTranslation()->matrix());
     EXPECT_EQ(IntSize(5, 3), overflowAScrollProperties->scroll()->clip());
     // 107 is the forceScroll element plus the height of the overflow scroll child (overflowB).
     EXPECT_EQ(IntSize(9, 107), overflowAScrollProperties->scroll()->bounds());
     EXPECT_TRUE(overflowAScrollProperties->scroll()->userScrollableHorizontal());
     EXPECT_TRUE(overflowAScrollProperties->scroll()->userScrollableVertical());
 
     const ObjectPaintProperties* overflowBScrollProperties = overflowB->layoutObject()->objectPaintProperties();
     // The overflow child's scroll node should be a child of the parent's (overflowA) scroll node.
     EXPECT_EQ(overflowAScrollProperties->scroll(), overflowBScrollProperties->scroll()->parent());
@@ skipping 68 matching lines @@
     EXPECT_EQ(IntSize(5, 4000), overflowScrollProperties->scroll()->bounds());
 
     const ObjectPaintProperties* absposOverflowScrollProperties = absposOverflow->layoutObject()->objectPaintProperties();
     // The absolute position overflow scroll node is parented under the frame, not the dom-order parent.
     EXPECT_EQ(frameScroll(), absposOverflowScrollProperties->scroll()->parent());
     EXPECT_EQ(TransformationMatrix().translate(0, -41), absposOverflowScrollProperties->scroll()->scrollOffsetTranslation()->matrix());
     EXPECT_EQ(IntSize(9, 7), absposOverflowScrollProperties->scroll()->clip());
     EXPECT_EQ(IntSize(9, 4000), absposOverflowScrollProperties->scroll()->bounds());
 
     const ObjectPaintProperties* fixedOverflowScrollProperties = fixedOverflow->layoutObject()->objectPaintProperties();
-    // The fixed position overflow scroll node is parented under the root, not the dom-order parent or frame's scroll.
-    EXPECT_EQ(rootScroll(), fixedOverflowScrollProperties->scroll()->parent());
+    // The fixed position overflow scroll node is a root node, not a child of the dom-order parent or the frame's scroll.
+    EXPECT_EQ(nullptr, fixedOverflowScrollProperties->scroll()->parent());
     EXPECT_EQ(TransformationMatrix().translate(0, -43), fixedOverflowScrollProperties->scroll()->scrollOffsetTranslation()->matrix());
     EXPECT_EQ(IntSize(13, 11), fixedOverflowScrollProperties->scroll()->clip());
     EXPECT_EQ(IntSize(13, 4000), fixedOverflowScrollProperties->scroll()->bounds());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, NestedPositionedScrollProperties)
 {
     setBodyInnerHTML(
         "<style>"
         "  * {"
@@ skipping 27 matching lines @@
         "</div>");
 
     Element* overflowA = document().getElementById("overflowA");
     overflowA->setScrollTop(37);
     Element* overflowB = document().getElementById("overflowB");
     overflowB->setScrollTop(41);
 
     document().view()->updateAllLifecyclePhases();
 
     const ObjectPaintProperties* overflowAScrollProperties = overflowA->layoutObject()->objectPaintProperties();
-    // Because the frameView is does not scroll, overflowA's scroll should be under the root.
-    EXPECT_EQ(rootScroll(), overflowAScrollProperties->scroll()->parent());
+    // Because the frameView is does not scroll, overflowA's scroll should be a root node.
+    EXPECT_EQ(nullptr, overflowAScrollProperties->scroll()->parent());
     EXPECT_EQ(TransformationMatrix().translate(0, -37), overflowAScrollProperties->scroll()->scrollOffsetTranslation()->matrix());
     EXPECT_EQ(IntSize(20, 20), overflowAScrollProperties->scroll()->clip());
     // 100 is the forceScroll element's height because the overflow child does not contribute to the height.
     EXPECT_EQ(IntSize(20, 100), overflowAScrollProperties->scroll()->bounds());
     EXPECT_TRUE(overflowAScrollProperties->scroll()->userScrollableHorizontal());
     EXPECT_TRUE(overflowAScrollProperties->scroll()->userScrollableVertical());
 
     const ObjectPaintProperties* overflowBScrollProperties = overflowB->layoutObject()->objectPaintProperties();
     // The overflow child's scroll node should be a child of the parent's (overflowA) scroll node.
     EXPECT_EQ(overflowAScrollProperties->scroll(), overflowBScrollProperties->scroll()->parent());
@@ skipping 20 matching lines @@
 {
     setBodyInnerHTML(
         "<svg id='svg' xmlns='http://www.w3.org/2000/svg' width='100px' height='100px' style='overflow: visible'>"
         "  <rect width='200' height='200' fill='red' />"
         "</svg>");
 
     EXPECT_FALSE(getLayoutObjectByElementId("svg")->objectPaintProperties()->overflowClip());
 }
 
 } // namespace blink