Painter side preparation for subtree caching

Source/core/paint/DisplayItemListPaintTest.cpp

Index: Source/core/paint/DisplayItemListPaintTest.cpp
diff --git a/Source/core/paint/DisplayItemListPaintTest.cpp b/Source/core/paint/DisplayItemListPaintTest.cpp
index 98ab81391bdd2ee998737530fd89da9bd23e1829..4a9f008783518b5926bf2dc0426d9e7d778a8586 100644
--- a/Source/core/paint/DisplayItemListPaintTest.cpp
+++ b/Source/core/paint/DisplayItemListPaintTest.cpp
@@ -27,7 +27,7 @@ class DisplayItemListPaintTest : public RenderingTest {
 public:
     DisplayItemListPaintTest()
         : m_layoutView(nullptr)
-        , m_originalSlimmingPaintEnabled(RuntimeEnabledFeatures::slimmingPaintEnabled()) { }
+        , m_originalSlimmingPaintV2Enabled(RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { }
 
 protected:
     LayoutView& layoutView() { return *m_layoutView; }
@@ -37,7 +37,8 @@ protected:
 private:
     void SetUp() override
     {
-        RuntimeEnabledFeatures::setSlimmingPaintEnabled(true);
+        ASSERT_TRUE(RuntimeEnabledFeatures::slimmingPaintEnabled());
+        RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true);
 
         RenderingTest::SetUp();
         enableCompositing();
@@ -48,11 +49,11 @@ private:
 
     void TearDown() override
     {
-        RuntimeEnabledFeatures::setSlimmingPaintEnabled(m_originalSlimmingPaintEnabled);
+        RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(m_originalSlimmingPaintV2Enabled);

[pdr., 2015/08/11 21:08:41]

I think we'll want to pipeline spv2 a bit more.
RuntimeEnabledFeatures::SlimmingPaintInvalidationEnabled?

[Xianzhu, 2015/08/11 21:52:22]

Many spv2 features seem to have mutual dependencies. For example, paint
invalidation requires no blink compositing[1] which requires cc layerization. It
seems hard to separate them into independent features.

[1] This is mainly for simplication. Paint invalidation v2 would be much
complicated with blink compositing because of the complex composited layer
structure.

     }
 
     LayoutView* m_layoutView;
-    bool m_originalSlimmingPaintEnabled;
+    bool m_originalSlimmingPaintV2Enabled;
 };
 
 class TestDisplayItem : public DisplayItem {
@@ -150,10 +151,12 @@ TEST_F(DisplayItemListPaintTest, InlineRelayout)
     InlineTextBox& newFirstTextBox = *newText.firstTextBox();
     InlineTextBox& secondTextBox = *newText.firstTextBox()->nextTextBox();
 
-    EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 3,
+    EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 5,
         TestDisplayItem(layoutView, DisplayItem::BoxDecorationBackground),
+        TestDisplayItem(divBlock, DisplayItem::paintPhaseToBeginSubtreeType(PaintPhaseForeground)),
         TestDisplayItem(newFirstTextBox, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
-        TestDisplayItem(secondTextBox, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
+        TestDisplayItem(secondTextBox, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
+        TestDisplayItem(divBlock, DisplayItem::paintPhaseToEndSubtreeType(PaintPhaseForeground)));
 }
 
 } // namespace blink