Enable subsequence caching for spv2

third_party/WebKit/Source/core/paint/PaintLayerPainterTest.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/LayoutBlock.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/paint/PaintControllerPaintTest.h"
 #include "platform/graphics/GraphicsContext.h"
 
 namespace blink {
 
+struct PaintLayerPainterTestParam {
+    PaintLayerPainterTestParam(FrameSettingOverrideFunction frameSettingOverride, bool slimmingPaintV2)
+        : frameSettingOverride(frameSettingOverride), slimmingPaintV2(slimmingPaintV2) { }
+
+    FrameSettingOverrideFunction frameSettingOverride;
+    bool slimmingPaintV2;
+};
+
 class PaintLayerPainterTest
-    : public PaintControllerPaintTest
-    , public testing::WithParamInterface<FrameSettingOverrideFunction> {
+    : public PaintControllerPaintTestBase
+    , public testing::WithParamInterface<PaintLayerPainterTestParam> {
     USING_FAST_MALLOC(PaintLayerPainterTest);
 public:
-    FrameSettingOverrideFunction settingOverrider() const override { return GetParam(); }
+    PaintLayerPainterTest() : PaintControllerPaintTestBase(GetParam().slimmingPaintV2) { }
+    FrameSettingOverrideFunction settingOverrider() const override { return GetParam().frameSettingOverride; }
 };
 
 INSTANTIATE_TEST_CASE_P(All, PaintLayerPainterTest, ::testing::Values(
-    nullptr,
-    RootLayerScrollsFrameSettingOverride));
+    PaintLayerPainterTestParam(nullptr, false), // non-root-layer-scrolls, slimming-paint-v1
+    PaintLayerPainterTestParam(nullptr, true), // non-root-layer-scrolls, slimming-paint-v2
+    PaintLayerPainterTestParam(RootLayerScrollsFrameSettingOverride, false), // root-layer-scrolls, slimming-paint-v1
+    PaintLayerPainterTestParam(RootLayerScrollsFrameSettingOverride, true))); // root-layer-scrolls, slimming-paint-v2
 
 TEST_P(PaintLayerPainterTest, CachedSubsequence)
 {
     setBodyInnerHTML(
         "<div id='container1' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
         "  <div id='content1' style='position: absolute; width: 100px; height: 100px; background-color: red'></div>"
         "</div>"
         "<div id='container2' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
         "  <div id='content2' style='position: absolute; width: 100px; height: 100px; background-color: green'></div>"
         "</div>");
@@ skipping 37 matching lines @@
         TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
         TestDisplayItem(container2Layer, DisplayItem::Subsequence),
         TestDisplayItem(container2, backgroundType),
         TestDisplayItem(content2, backgroundType),
         TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
         TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
 }
 
 TEST_P(PaintLayerPainterTest, CachedSubsequenceOnInterestRectChange)
 {
+    // TODO(wangxianzhu): SPv2 deals with interest rect differently, so disable this test for SPv2 temporarily.
+    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+        return;
+
     setBodyInnerHTML(
         "<div id='container1' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
         "  <div id='content1' style='position: absolute; width: 100px; height: 100px; background-color: green'></div>"
         "</div>"
         "<div id='container2' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
         "  <div id='content2a' style='position: absolute; width: 100px; height: 100px; background-color: green'></div>"
         "  <div id='content2b' style='position: absolute; top: 200px; width: 100px; height: 100px; background-color: green'></div>"
         "</div>"
         "<div id='container3' style='position: absolute; z-index: 2; left: 300px; top: 0; width: 200px; height: 200px; background-color: blue'>"
         "  <div id='content3' style='position: absolute; width: 200px; height: 200px; background-color: green'></div>"
@@ skipping 38 matching lines @@
         TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
 
     document().view()->updateAllLifecyclePhasesExceptPaint();
     IntRect newInterestRect(0, 100, 300, 1000);
     EXPECT_TRUE(paintWithoutCommit(&newInterestRect));
 
     // Container1 becomes partly in the interest rect, but uses cached subsequence
     // because it was fully painted before;
     // Container2's intersection with the interest rect changes;
     // Content2b is out of the interest rect and outputs nothing;
-    // Container3 becomes out of the interest rect and outputs empty subsequence pair..
+    // Container3 becomes out of the interest rect and outputs empty subsequence pair.
     EXPECT_EQ(7, numCachedNewItems());
 
     commit();
 
     EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 14,
         TestDisplayItem(layoutView(), documentBackgroundType),
         TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
         TestDisplayItem(container1Layer, DisplayItem::Subsequence),
         TestDisplayItem(container1, backgroundType),
         TestDisplayItem(content1, backgroundType),
@@ skipping 352 matching lines @@
     PaintLayer& layer = *table.layer();
     EXPECT_TRUE(layer.isSelfPaintingLayer());
     EXPECT_FALSE(layer.needsPaintPhaseDescendantBlockBackgrounds());
 
     toHTMLElement(table.node())->setAttribute(HTMLNames::styleAttr, "position: relative; border-collapse: collapse");
     document().view()->updateAllLifecyclePhases();
     EXPECT_TRUE(layer.needsPaintPhaseDescendantBlockBackgrounds());
 }
 
 } // namespace blink