Move scroll paint property nodes to be owned by the transform tree

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/paint/PaintPropertyTreeBuilderTest.h"
 
 #include "core/html/HTMLIFrameElement.h"
 #include "core/layout/LayoutTreeAsText.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintPropertyTreePrinter.h"
@@ skipping 29 matching lines @@
   FrameView* frameView = document().view();
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
     return frameView->layoutView()->paintProperties()->overflowClip();
   return frameView->contentClip();
 }
 
 const ScrollPaintPropertyNode* PaintPropertyTreeBuilderTest::frameScroll(
     FrameView* frameView) {
   if (!frameView)
     frameView = document().view();
-  if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
-    return frameView->layoutView()->paintProperties()->scroll();
-  return frameView->scroll();
+  if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
+    const auto* scrollTranslation =
+        frameView->layoutView()->paintProperties()->scrollTranslation();
+    return scrollTranslation ? scrollTranslation->scrollNode() : nullptr;
+  }
+  return frameView->scrollTranslation()
+             ? frameView->scrollTranslation()->scrollNode()
+             : nullptr;
 }
 
 const ObjectPaintProperties*
 PaintPropertyTreeBuilderTest::paintPropertiesForElement(const char* name) {
   return document().getElementById(name)->layoutObject()->paintProperties();
 }
 
 void PaintPropertyTreeBuilderTest::SetUp() {
   Settings::setMockScrollbarsEnabled(true);
 
@@ skipping 79 matching lines @@
   // target1 should not have its own scroll node and instead should inherit
   // positionedScroll's.
   const ObjectPaintProperties* positionedScrollProperties =
       positionedScroll->layoutObject()->paintProperties();
   auto* positionedScrollTranslation =
       positionedScrollProperties->scrollTranslation();
   auto* positionedScrollNode = positionedScrollTranslation->scrollNode();
   EXPECT_TRUE(positionedScrollNode->parent()->isRoot());
   EXPECT_EQ(TransformationMatrix().translate(0, -3),
             positionedScrollTranslation->matrix());
-  EXPECT_EQ(nullptr, target1Properties->scroll());
+  EXPECT_EQ(nullptr, target1Properties->scrollTranslation());
   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()->paintProperties();
   Element* scroller = document().getElementById("transformedScroll");
   const ObjectPaintProperties* scrollerProperties =
       scroller->layoutObject()->paintProperties();
   EXPECT_EQ(FloatRoundedRect(200, 150, 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()->paintProperties();
   auto* transformedScrollTranslation =
       transformedScrollProperties->scrollTranslation();
   auto* transformedScrollNode = transformedScrollTranslation->scrollNode();
   EXPECT_TRUE(transformedScrollNode->parent()->isRoot());
   EXPECT_EQ(TransformationMatrix().translate(0, -5),
             transformedScrollTranslation->matrix());
-  EXPECT_EQ(nullptr, target2Properties->scroll());
+  EXPECT_EQ(nullptr, target2Properties->scrollTranslation());
 
   CHECK_EXACT_VISUAL_RECT(LayoutRect(208, 153, 200, 100),
                           target2->layoutObject(), frameView->layoutView());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, PositionAndScroll) {
   loadTestData("position-and-scroll.html");
 
   Element* scroller = document().getElementById("scroller");
   scroller->scrollTo(0, 100);
   FrameView* frameView = document().view();
   frameView->updateAllLifecyclePhases();
   const ObjectPaintProperties* scrollerProperties =
       scroller->layoutObject()->paintProperties();
   EXPECT_EQ(TransformationMatrix().translate(0, -100),
             scrollerProperties->scrollTranslation()->matrix());
   EXPECT_EQ(frameScrollTranslation(),
             scrollerProperties->scrollTranslation()->parent());
   EXPECT_EQ(frameScrollTranslation(),
             scrollerProperties->overflowClip()->localTransformSpace());
-  EXPECT_EQ(frameScroll(), scrollerProperties->scroll()->parent());
-  EXPECT_EQ(FloatSize(413, 317), scrollerProperties->scroll()->clip());
-  EXPECT_EQ(FloatSize(660, 10200), scrollerProperties->scroll()->bounds());
-  EXPECT_FALSE(scrollerProperties->scroll()->userScrollableHorizontal());
-  EXPECT_TRUE(scrollerProperties->scroll()->userScrollableVertical());
+  const auto* scroll = scrollerProperties->scrollTranslation()->scrollNode();
+  EXPECT_EQ(frameScroll(), scroll->parent());
+  EXPECT_EQ(FloatSize(413, 317), scroll->clip());
+  EXPECT_EQ(FloatSize(660, 10200), scroll->bounds());
+  EXPECT_FALSE(scroll->userScrollableHorizontal());
+  EXPECT_TRUE(scroll->userScrollableVertical());
   EXPECT_EQ(FloatRoundedRect(120, 340, 413, 317),
             scrollerProperties->overflowClip()->clipRect());
   EXPECT_EQ(frameContentClip(), scrollerProperties->overflowClip()->parent());
   CHECK_EXACT_VISUAL_RECT(LayoutRect(120, 340, 413, 317),
                           scroller->layoutObject(), frameView->layoutView());
 
   // The relative-positioned element should have accumulated box offset (exclude
   // scrolling), and should be affected by ancestor scroll transforms.
   Element* relPos = document().getElementById("rel-pos");
   const ObjectPaintProperties* relPosProperties =
@@ skipping 2500 matching lines @@
 
   document().view()->updateAllLifecyclePhases();
 
   // The frame should scroll due to the "forceScroll" element.
   EXPECT_NE(nullptr, frameScroll());
 
   const ObjectPaintProperties* overflowScrollProperties =
       overflow->layoutObject()->paintProperties();
   auto* scrollTranslation = overflowScrollProperties->scrollTranslation();
   auto* overflowScrollNode = scrollTranslation->scrollNode();
-  EXPECT_EQ(frameScroll(), overflowScrollProperties->scroll()->parent());
+  EXPECT_EQ(
+      frameScroll(),
+      overflowScrollProperties->scrollTranslation()->scrollNode()->parent());
   EXPECT_EQ(TransformationMatrix().translate(0, -37),
             scrollTranslation->matrix());
   EXPECT_EQ(IntSize(5, 3), overflowScrollNode->clip());
   // The height should be 4000px because the (dom-order) overflow children are
   // positioned and do not contribute to the height. Only the 4000px
   // "forceScroll" height is present.
   EXPECT_EQ(IntSize(5, 4000), overflowScrollNode->bounds());
 
   const ObjectPaintProperties* absposOverflowScrollProperties =
       absposOverflow->layoutObject()->paintProperties();
@@ skipping 134 matching lines @@
       "    height: 4000px;"
       "  }"
       "</style>"
       "<div id='overflow'>"
       "  <div class='backgroundAttachmentFixed'></div>"
       "</div>"
       "<div class='forceScroll'></div>");
   Element* overflow = document().getElementById("overflow");
   EXPECT_TRUE(frameScroll()->hasBackgroundAttachmentFixedDescendants());
   // No scroll node is needed.
-  EXPECT_EQ(overflow->layoutObject()->paintProperties()->scroll(), nullptr);
+  EXPECT_EQ(overflow->layoutObject()->paintProperties()->scrollTranslation(),
+            nullptr);
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, PaintOffsetsUnderMultiColumn) {
   setBodyInnerHTML(
       "<style>"
       "  body { margin: 0; }"
       "  .space { height: 30px; }"
       "  .abs { position: absolute; width: 20px; height: 20px; }"
       "</style>"
       "<div style='columns:2; width: 200px; column-gap: 0'>"
@@ skipping 267 matching lines @@
       "<div id='target' style='overflow: auto; width: 100px; height: 100px'>"
       "  <div style='width: 200px; height: 200px'></div>"
       "</div>");
 
   const ObjectPaintProperties* properties = paintPropertiesForElement("target");
   EXPECT_NE(CompositorElementId(),
             properties->scrollTranslation()->compositorElementId());
 }
 
 }  // namespace blink