Refactor LayoutView paint offset updates out of FrameView update code

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 223 matching lines @@
   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());
   EXPECT_EQ(FloatRoundedRect(120, 340, 413, 317),
             scrollerProperties->overflowClip()->clipRect());
   EXPECT_EQ(frameContentClip(), scrollerProperties->overflowClip()->parent());
-  // http://crbug.com/638415
-  if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
-    CHECK_EXACT_VISUAL_RECT(LayoutRect(120, 340, 413, 317),
-                            scroller->layoutObject(), frameView->layoutView());
-  }
+  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 =
       relPos->layoutObject()->paintProperties();
   EXPECT_EQ(TransformationMatrix().translate(680, 1120),
             relPosProperties->paintOffsetTranslation()->matrix());
   EXPECT_EQ(scrollerProperties->scrollTranslation(),
             relPosProperties->paintOffsetTranslation()->parent());
@@ skipping 13 matching lines @@
       absPos->layoutObject()->paintProperties();
   EXPECT_EQ(TransformationMatrix().translate(123, 456),
             absPosProperties->paintOffsetTranslation()->matrix());
   EXPECT_EQ(frameScrollTranslation(),
             absPosProperties->paintOffsetTranslation()->parent());
   EXPECT_EQ(absPosProperties->transform(),
             absPosProperties->overflowClip()->localTransformSpace());
   EXPECT_EQ(FloatRoundedRect(0, 0, 300, 400),
             absPosProperties->overflowClip()->clipRect());
   EXPECT_EQ(frameContentClip(), absPosProperties->overflowClip()->parent());
-  // http://crbug.com/638415
-  if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     CHECK_EXACT_VISUAL_RECT(LayoutRect(123, 456, 300, 400),
                             absPos->layoutObject(), frameView->layoutView());
-  }
 }
 
 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());
   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.paintProperties();
-  // 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());
+    const auto* viewProperties = frameView->layoutView()->paintProperties();
+    EXPECT_EQ(nullptr, viewProperties->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()->paintProperties();
   EXPECT_EQ(TransformationMatrix().applyPerspective(100),
             perspectiveProperties->perspective()->matrix());
@@ skipping 26 matching lines @@
   EXPECT_EQ(TransformationMatrix().translate3d(123, 456, 789),
             transformProperties->transform()->matrix());
   EXPECT_EQ(FloatPoint3D(200, 150, 0),
             transformProperties->transform()->origin());
   EXPECT_EQ(transformProperties->paintOffsetTranslation(),
             transformProperties->transform()->parent());
   EXPECT_EQ(TransformationMatrix().translate(50, 100),
             transformProperties->paintOffsetTranslation()->matrix());
   EXPECT_EQ(frameScrollTranslation(),
             transformProperties->paintOffsetTranslation()->parent());
-  // http://crbug.com/638415
-  if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     CHECK_EXACT_VISUAL_RECT(LayoutRect(173, 556, 400, 300),
                             transform->layoutObject(),
                             document().view()->layoutView());
-  }
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, RelativePositionInline) {
   loadTestData("relative-position-inline.html");
 
   Element* inlineBlock = document().getElementById("inline-block");
   const ObjectPaintProperties* inlineBlockProperties =
       inlineBlock->layoutObject()->paintProperties();
   EXPECT_EQ(TransformationMatrix().translate(135, 490),
             inlineBlockProperties->paintOffsetTranslation()->matrix());
@@ skipping 606 matching lines @@
       "translate3d(4px, 5px, 6px); width: 100px; height: 200px'></div>");
   FrameView* frameView = document().view();
   frameView->updateAllLifecyclePhases();
 
   LayoutObject* divWithTransform =
       document().getElementById("divWithTransform")->layoutObject();
   const ObjectPaintProperties* divWithTransformProperties =
       divWithTransform->paintProperties();
   EXPECT_EQ(TransformationMatrix().translate3d(1, 2, 3),
             divWithTransformProperties->transform()->matrix());
-  // http://crbug.com/638415
-  if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     CHECK_EXACT_VISUAL_RECT(LayoutRect(1, 2, 800, 164), divWithTransform,
                             frameView->layoutView());
-  }
 
   LayoutObject* innerDivWithTransform =
       frameDocument.getElementById("transform")->layoutObject();
   const ObjectPaintProperties* innerDivWithTransformProperties =
       innerDivWithTransform->paintProperties();
   auto* innerDivTransform = innerDivWithTransformProperties->transform();
   EXPECT_EQ(TransformationMatrix().translate3d(4, 5, 6),
             innerDivTransform->matrix());
   CHECK_EXACT_VISUAL_RECT(LayoutRect(12, 14, 100, 145), innerDivWithTransform,
                           frameView->layoutView());
@@ skipping 68 matching lines @@
   EXPECT_EQ(TransformationMatrix().translate3d(7, 7, 0),
             iframePaintOffsetTranslation->matrix());
   auto* divWithTransformTransform = iframePaintOffsetTranslation->parent();
   EXPECT_EQ(TransformationMatrix().translate3d(1, 2, 3),
             divWithTransformTransform->matrix());
 
   LayoutObject* divWithTransform =
       document().getElementById("divWithTransform")->layoutObject();
   EXPECT_EQ(divWithTransformTransform,
             divWithTransform->paintProperties()->transform());
-  // http://crbug.com/638415
-  if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     CHECK_EXACT_VISUAL_RECT(LayoutRect(1, 2, 800, 248), divWithTransform,
                             frameView->layoutView());
-  }
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, TreeContextClipByNonStackingContext) {
   // 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='scroller' style='overflow:scroll; width:400px; height:300px;'>"
       "  <div id='child' style='position:relative; width:100px; height: "
@@ skipping 46 matching lines @@
 
   EXPECT_EQ(
       frameContentClip(),
       childProperties->localBorderBoxProperties()->propertyTreeState.clip());
   EXPECT_EQ(frameScrollTranslation(),
             childProperties->localBorderBoxProperties()
                 ->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.  Table cells have weird location adjustment in our
   // layout/paint implementation.
   setBodyInnerHTML(
       "<style>"
@@ skipping 1760 matching lines @@
   EXPECT_EQ(framePreTranslation(),
             childProperties->paintOffsetTranslation()->parent());
   EXPECT_EQ(childProperties->paintOffsetTranslation(),
             childPaintState.transform());
   // This will change once we added clip expansion node.
   EXPECT_EQ(filterProperties->effect()->outputClip(), childPaintState.clip());
   EXPECT_EQ(filterProperties->effect(), childPaintState.effect());
 }
 
 }  // namespace blink