Convert Settings::rootLayerScrolls to RuntimeEnabledFeatures

third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp

Index: third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
index b3ff09e0e80f10dd5fab6be7bfe3afd4833eca10..d8d40fe864bfac5d38232eb3c0b444cff237a061 100644
--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
@@ -167,32 +167,6 @@ TEST_F(PaintPropertyTreeBuilderTest, FrameScrollingTraditional)
     CHECK_EXACT_VISUAL_RECT(document().body()->layoutObject(), frameView->layoutView());
 }
 
-// TODO(trchen): Settings::rootLayerScrolls cannot be switched after main frame being created.
-// Need to set it during test setup. Besides that, the test still won't work because
-// root layer scrolling mode is not compatible with SPv2 at this moment.
-// (Duplicate display item ID for FrameView and LayoutView.)
-TEST_F(PaintPropertyTreeBuilderTest, DISABLED_FrameScrollingRootLayerScrolls)
-{
-    document().settings()->setRootLayerScrolls(true);
-
-    setBodyInnerHTML("<style> body { height: 10000px; } </style>");
-
-    document().domWindow()->scrollTo(0, 100);
-
-    FrameView* frameView = document().view();
-    frameView->updateAllLifecyclePhases();
-    EXPECT_EQ(TransformationMatrix(), frameView->preTranslation()->matrix());
-    EXPECT_EQ(nullptr, frameView->preTranslation()->parent());
-    EXPECT_EQ(TransformationMatrix(), frameView->scrollTranslation()->matrix());
-    EXPECT_EQ(frameView->preTranslation(), frameView->scrollTranslation()->parent());
-
-    LayoutViewItem layoutViewItem = document().layoutViewItem();
-    const ObjectPaintProperties* layoutViewProperties = layoutViewItem.objectPaintProperties();
-    EXPECT_EQ(TransformationMatrix().translate(0, -100), layoutViewProperties->scrollTranslation()->matrix());
-    EXPECT_EQ(frameView->scrollTranslation(), layoutViewProperties->scrollTranslation()->parent());
-    CHECK_EXACT_VISUAL_RECT(document().body()->layoutObject(), frameView->layoutView());
-}
-
 TEST_F(PaintPropertyTreeBuilderTest, Perspective)
 {
     loadTestData("perspective.html");