Convert Settings::rootLayerScrolls to RuntimeEnabledFeatures

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 "platform/graphics/paint/GeometryMapper.h"
 #include "platform/graphics/paint/TransformPaintPropertyNode.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "platform/text/TextStream.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/HashMap.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
+typedef bool TestParamRootLayerScrolling;
 class PaintPropertyTreeBuilderTest
     : public RenderingTest
-    , public ::testing::WithParamInterface<FrameSettingOverrideFunction> {
+    , public ::testing::WithParamInterface<TestParamRootLayerScrolling> {
 public:
     PaintPropertyTreeBuilderTest()
         : RenderingTest(SingleChildFrameLoaderClient::create())
-        , m_originalSlimmingPaintV2Enabled(RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { }
+        , m_originalSlimmingPaintV2Enabled(RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+        , m_originalRootLayerScrollingEnabled(RuntimeEnabledFeatures::rootLayerScrollingEnabled())
+        , m_enableRootLayerScrolling(GetParam())
+    {
+        RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true);
+        RuntimeEnabledFeatures::setRootLayerScrollingEnabled(m_enableRootLayerScrolling);
+    }
+
+    ~PaintPropertyTreeBuilderTest()
+    {
+        CHECK_EQ(true, RuntimeEnabledFeatures::slimmingPaintV2Enabled());
+        CHECK_EQ(m_enableRootLayerScrolling, RuntimeEnabledFeatures::rootLayerScrollingEnabled());
+        RuntimeEnabledFeatures::setRootLayerScrollingEnabled(m_originalRootLayerScrollingEnabled);

[esprehn, 2016/08/25 23:59:24]

We do this manually in a lot of places?

[trchen, 2016/08/26 00:15:11]

Good point. I was tired of this too. I can make it a RAII mix-in class.

+        RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(m_originalSlimmingPaintV2Enabled);
+    }
 
     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()));
     }
 
-    bool rootLayerScrolls()
-    {
-        return document().settings() && document().settings()->rootLayerScrolls();
-    }
-
     const TransformPaintPropertyNode* rootTransform()
     {
         FrameView* frameView = document().view();
-        if (rootLayerScrolls())
+        if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
             return frameView->layoutView()->objectPaintProperties()->paintOffsetTranslation();
         return frameView->rootTransform();
     }
 
     const ClipPaintPropertyNode* rootClip()
     {
-        if (rootLayerScrolls())
+        if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
             return document().view()->layoutView()->objectPaintProperties()->localBorderBoxProperties()->propertyTreeState.clip.get();
         return document().view()->rootClip();
     }
 
     const TransformPaintPropertyNode* framePreTranslation()
     {
         FrameView* frameView = document().view();
-        if (rootLayerScrolls())
+        if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
             return frameView->layoutView()->objectPaintProperties()->paintOffsetTranslation();
         return frameView->preTranslation();
     }
 
     const TransformPaintPropertyNode* frameScrollTranslation()
     {
         FrameView* frameView = document().view();
-        if (rootLayerScrolls())
+        if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
             return frameView->layoutView()->objectPaintProperties()->scrollTranslation();
         return frameView->scrollTranslation();
     }
 
     const ClipPaintPropertyNode* frameContentClip()
     {
         FrameView* frameView = document().view();
-        if (rootLayerScrolls())
+        if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
             return frameView->layoutView()->objectPaintProperties()->overflowClip();
         return frameView->contentClip();
     }
 
-    FrameSettingOverrideFunction settingOverrider() const override { return GetParam(); }
-
 private:
     void SetUp() override
     {
-        RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true);
         Settings::setMockScrollbarsEnabled(true);
 
         RenderingTest::SetUp();
         enableCompositing();
     }
 
     void TearDown() override
     {
         RenderingTest::TearDown();
 
         Settings::setMockScrollbarsEnabled(false);
-        RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(m_originalSlimmingPaintV2Enabled);
     }
 
     bool m_originalSlimmingPaintV2Enabled;
+    bool m_originalRootLayerScrollingEnabled;
+    bool m_enableRootLayerScrolling;
 };
 
 #define CHECK_VISUAL_RECT(expected, sourceLayoutObject, ancestorLayoutObject, slopFactor) \
 do { \
     GeometryMapper geometryMapper; \
     LayoutRect source((sourceLayoutObject)->localOverflowRectForPaintInvalidation()); \
     source.moveBy((sourceLayoutObject)->objectPaintProperties()->localBorderBoxProperties()->paintOffset); \
     bool success = false; \
     FloatRect actual = geometryMapper.mapToVisualRectInDestinationSpace( \
         FloatRect(source), \
@@ skipping 12 matching lines @@
         SCOPED_TRACE(String::format("Old path rect: %s, Actual: %s, Inflated actual: %s", slowPathRect.toString().ascii().data(), actual.toString().ascii().data(), inflatedActual.toString().ascii().data())); \
         EXPECT_TRUE(slowPathRect.contains(LayoutRect(actual))); \
         EXPECT_TRUE(inflatedActual.contains(slowPathRect)); \
     } else { \
         EXPECT_EQ(slowPathRect, LayoutRect(actual)); \
     } \
 } while (0)
 
 #define CHECK_EXACT_VISUAL_RECT(expected, sourceLayoutObject, ancestorLayoutObject) CHECK_VISUAL_RECT(expected, sourceLayoutObject, ancestorLayoutObject, 0)
 
-INSTANTIATE_TEST_CASE_P(All, PaintPropertyTreeBuilderTest, ::testing::Values(nullptr, &RootLayerScrollsFrameSettingOverride));
+INSTANTIATE_TEST_CASE_P(All, PaintPropertyTreeBuilderTest, ::testing::Bool());
 
 TEST_P(PaintPropertyTreeBuilderTest, FixedPosition)
 {
     loadTestData("fixed-position.html");
 
     FrameView* frameView = document().view();
 
     // target1 is a fixed-position element inside an absolute-position scrolling element.
     // It should be attached under the viewport to skip scrolling and offset of the parent.
     Element* target1 = document().getElementById("target1");
@@ skipping 28 matching lines @@
     scroller->scrollTo(0, 100);
     FrameView* frameView = document().view();
     frameView->updateAllLifecyclePhases();
     const ObjectPaintProperties* scrollerProperties = scroller->layoutObject()->objectPaintProperties();
     EXPECT_EQ(TransformationMatrix().translate(0, -100), scrollerProperties->scrollTranslation()->matrix());
     EXPECT_EQ(frameScrollTranslation(), scrollerProperties->scrollTranslation()->parent());
     EXPECT_EQ(frameScrollTranslation(), scrollerProperties->overflowClip()->localTransformSpace());
     EXPECT_EQ(FloatRoundedRect(120, 340, 400, 300), scrollerProperties->overflowClip()->clipRect());
     EXPECT_EQ(frameContentClip(), scrollerProperties->overflowClip()->parent());
     // http://crbug.com/638415
-    if (!rootLayerScrolls()) {
+    if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
         CHECK_EXACT_VISUAL_RECT(LayoutRect(120, 340, 400, 300), 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()->objectPaintProperties();
     EXPECT_EQ(TransformationMatrix().translate(680, 1120), relPosProperties->paintOffsetTranslation()->matrix());
     EXPECT_EQ(scrollerProperties->scrollTranslation(), relPosProperties->paintOffsetTranslation()->parent());
     EXPECT_EQ(relPosProperties->transform(), relPosProperties->overflowClip()->localTransformSpace());
     EXPECT_EQ(FloatRoundedRect(0, 0, 100, 200), relPosProperties->overflowClip()->clipRect());
     EXPECT_EQ(scrollerProperties->overflowClip(), relPosProperties->overflowClip()->parent());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(), relPos->layoutObject(), frameView->layoutView());
 
     // The absolute-positioned element should not be affected by non-positioned scroller at all.
     Element* absPos = document().getElementById("abs-pos");
     const ObjectPaintProperties* absPosProperties = absPos->layoutObject()->objectPaintProperties();
     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 (!rootLayerScrolls()) {
+    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());
-    if (!rootLayerScrolls())
+    if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled())
         EXPECT_EQ(rootTransform(), framePreTranslation()->parent());
     EXPECT_EQ(nullptr, rootTransform()->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 (!rootLayerScrolls())
+    if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled())
         EXPECT_EQ(nullptr, rootClip()->parent());
 
     LayoutViewItem layoutViewItem = document().layoutViewItem();
     const ObjectPaintProperties* layoutViewProperties = layoutViewItem.objectPaintProperties();
     // http://crbug.com/638415
-    if (!rootLayerScrolls()) {
+    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");
@@ skipping 16 matching lines @@
     loadTestData("transform.html");
 
     Element* transform = document().getElementById("transform");
     const ObjectPaintProperties* transformProperties = transform->layoutObject()->objectPaintProperties();
     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 (!rootLayerScrolls()) {
+    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()->objectPaintProperties();
@@ skipping 459 matching lines @@
         "</div>");
     Document& frameDocument = setupChildIframe("frame",
         "<style>body { margin: 0; }</style><div id='transform' style='transform: 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->objectPaintProperties();
     EXPECT_EQ(TransformationMatrix().translate3d(1, 2, 3), divWithTransformProperties->transform()->matrix());
     // http://crbug.com/638415
-    if (!rootLayerScrolls()) {
+    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->objectPaintProperties();
     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());
 
     // Ensure that the inner div's transform is correctly rooted in the root frame's transform tree.
@@ skipping 46 matching lines @@
     auto* iframeTransform = iframePreTranslation->parent();
     EXPECT_EQ(TransformationMatrix().translate3d(4, 5, 6), iframeTransform->matrix());
     auto* iframePaintOffsetTranslation = iframeTransform->parent();
     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->objectPaintProperties()->transform());
     // http://crbug.com/638415
-    if (!rootLayerScrolls()) {
+    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(
@@ skipping 32 matching lines @@
     );
 
     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()->propertyTreeState.clip);
     EXPECT_EQ(frameScrollTranslation(), childProperties->localBorderBoxProperties()->propertyTreeState.transform);
     EXPECT_EQ(scrollerProperties->effect(), childProperties->localBorderBoxProperties()->propertyTreeState.effect);
-    if (!rootLayerScrolls()) {
+    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(
@@ skipping 706 matching lines @@
     EXPECT_EQ(cProperties, c->layoutObject()->objectPaintProperties());
     EXPECT_EQ(cTransformNode, cProperties->transform());
     EXPECT_EQ(bTransformNode, cTransformNode->parent());
 
     CHECK_EXACT_VISUAL_RECT(LayoutRect(33, 44, 50, 60), a->layoutObject(), frameView->layoutView());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(37, 49, 50, 20), b->layoutObject(), frameView->layoutView());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(114, 137, 10, 20), c->layoutObject(), frameView->layoutView());
 }
 
 } // namespace blink