Preparation for enabling slimming paint synchronized painting

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

Index: third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp b/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp
index 9f41d0fff9cd510326c12f283e12c9af643043cd..17438038ce9e232fe92b2eb84e05def94defdb5d 100644
--- a/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp
+++ b/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp
@@ -18,7 +18,6 @@
 namespace blink {
 
 using LayoutObjectDrawingRecorderTest = PaintControllerPaintTest;
-using LayoutObjectDrawingRecorderTestForSlimmingPaintV2 = PaintControllerPaintTestForSlimmingPaintV2;

[Xianzhu, 2015/10/28 18:10:23]

This was not used. We also don't need to test for v2 because the tests cover
common code.

 
 namespace {
 
@@ -41,10 +40,9 @@ void drawRect(GraphicsContext& context, LayoutView& layoutView, PaintPhase phase
 
 TEST_F(LayoutObjectDrawingRecorderTest, Nothing)
 {
+    rootPaintController().invalidateAll();
     GraphicsContext context(rootPaintController());
     LayoutRect bound = layoutView().viewRect();
-    EXPECT_EQ((size_t)0, rootPaintController().displayItemList().size());
-
     drawNothing(context, layoutView(), PaintPhaseForeground, bound);
     rootPaintController().commitNewDisplayItems();
     EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 1,
@@ -54,6 +52,7 @@ TEST_F(LayoutObjectDrawingRecorderTest, Nothing)
 
 TEST_F(LayoutObjectDrawingRecorderTest, Rect)
 {
+    rootPaintController().invalidateAll();
     GraphicsContext context(rootPaintController());
     LayoutRect bound = layoutView().viewRect();
     drawRect(context, layoutView(), PaintPhaseForeground, bound);
@@ -64,6 +63,7 @@ TEST_F(LayoutObjectDrawingRecorderTest, Rect)
 
 TEST_F(LayoutObjectDrawingRecorderTest, Cached)
 {
+    rootPaintController().invalidateAll();
     GraphicsContext context(rootPaintController());
     LayoutRect bound = layoutView().viewRect();
     drawNothing(context, layoutView(), PaintPhaseBlockBackground, bound);