Preparation for enabling slimming paint synchronized painting

third_party/WebKit/Source/core/paint/TableCellPainterTest.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 "config.h"
 
 #include "core/paint/PaintControllerPaintTest.h"
 #include "core/paint/PaintLayerPainter.h"
-#include "platform/graphics/GraphicsContext.h"
 
 namespace blink {
 
-using TableCellPainterTest = PaintControllerPaintTest;
+using TableCellPainterTest = PaintControllerPaintTestForSlimmingPaintV1AndV2;
 
-// TODO(wangxianzhu): Create a version for slimming paint v2 when it supports interest rect
-TEST_F(TableCellPainterTest, TableCellBackgroundInterestRect)
+INSTANTIATE_TEST_CASE_P(All, TableCellPainterTest, ::testing::Bool());
+
+TEST_P(TableCellPainterTest, TableCellBackgroundInterestRect)
 {
     setBodyInnerHTML(
         "<style>"
         "  td { width: 200px; height: 200px; border: none; }"
         "  tr { background-color: blue; }"
         "  table { border: none; border-spacing: 0; border-collapse: collapse; }"
         "</style>"
         "<table>"
         "  <tr><td id='cell1'></td></tr>"
         "  <tr><td id='cell2'></td></tr>"
         "</table>");
 
+    rootPaintController().invalidateAll();
+
     LayoutView& layoutView = *document().layoutView();
     PaintLayer& rootLayer = *layoutView.layer();
     LayoutObject& cell1 = *document().getElementById("cell1")->layoutObject();
     LayoutObject& cell2 = *document().getElementById("cell2")->layoutObject();
 
-    GraphicsContext context(rootPaintController());
-    PaintLayerPaintingInfo paintingInfo(&rootLayer, LayoutRect(0, 0, 200, 200), GlobalPaintNormalPhase, LayoutSize());
-    PaintLayerPainter(rootLayer).paintLayerContents(&context, paintingInfo, PaintLayerPaintingCompositingAllPhases);
-    rootPaintController().commitNewDisplayItems();
+    LayoutRect interestRect(0, 0, 200, 200);
+    document().view()->updateAllLifecyclePhases(&interestRect);
 
-    EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 2,
+    EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 4,
         TestDisplayItem(layoutView, DisplayItem::BoxDecorationBackground),
-        TestDisplayItem(cell1, DisplayItem::TableCellBackgroundFromRow));
+        TestDisplayItem(rootLayer, subsequenceType),
+        TestDisplayItem(cell1, DisplayItem::TableCellBackgroundFromRow),
+        TestDisplayItem(rootLayer, endSubsequenceType));
 
-    PaintLayerPaintingInfo paintingInfo1(&rootLayer, LayoutRect(0, 300, 200, 200), GlobalPaintNormalPhase, LayoutSize());
-    PaintLayerPainter(rootLayer).paintLayerContents(&context, paintingInfo1, PaintLayerPaintingCompositingAllPhases);
-    rootPaintController().commitNewDisplayItems();
+    interestRect = LayoutRect(0, 300, 200, 200);
+    document().view()->updateAllLifecyclePhases(&interestRect);
 
-    EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 2,
+    EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 4,
         TestDisplayItem(layoutView, DisplayItem::BoxDecorationBackground),
-        TestDisplayItem(cell2, DisplayItem::TableCellBackgroundFromRow));
+        TestDisplayItem(rootLayer, subsequenceType),
+        TestDisplayItem(cell2, DisplayItem::TableCellBackgroundFromRow),
+        TestDisplayItem(rootLayer, endSubsequenceType));
 }
 
 } // namespace blink