Remove display item scope

third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp

 // Copyright 2014 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 "platform/graphics/paint/PaintController.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/CachedDisplayItem.h"
 #include "platform/graphics/paint/ClipPathDisplayItem.h"
@@ skipping 604 matching lines @@
 
         TestDisplayItem(container1, DisplayItem::Subsequence),
         TestDisplayItem(content1, DisplayItem::Subsequence),
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(content1, foregroundDrawingType),
         TestDisplayItem(content1, DisplayItem::EndSubsequence),
         TestDisplayItem(container1, foregroundDrawingType),
         TestDisplayItem(container1, DisplayItem::EndSubsequence));
 }
 
-TEST_F(PaintControllerTest, Scope)
+TEST_F(PaintControllerTest, SkipCache)
 {
     FakeDisplayItemClient multicol("multicol");
     FakeDisplayItemClient content("content");
     GraphicsContext context(getPaintController());
 
     FloatRect rect1(100, 100, 50, 50);
     FloatRect rect2(150, 100, 50, 50);
     FloatRect rect3(200, 100, 50, 50);
 
     drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 200, 100, 100));
 
-    getPaintController().beginScope();
+    getPaintController().beginSkippingCache();
     drawRect(context, content, foregroundDrawingType, rect1);
-    getPaintController().endScope();
+    drawRect(context, content, foregroundDrawingType, rect2);
+    getPaintController().endSkippingCache();
 
-    getPaintController().beginScope();
-    drawRect(context, content, foregroundDrawingType, rect2);
-    getPaintController().endScope();
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
     RefPtr<const SkPicture> picture1 = static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[1]).picture();
     RefPtr<const SkPicture> picture2 = static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[2]).picture();
     EXPECT_NE(picture1, picture2);
 
     // Draw again with nothing invalidated.
     EXPECT_TRUE(getPaintController().clientCacheIsValid(multicol));
     drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 200, 100, 100));
-    getPaintController().beginScope();
+
+    getPaintController().beginSkippingCache();
     drawRect(context, content, foregroundDrawingType, rect1);
-    getPaintController().endScope();
-
-    getPaintController().beginScope();
     drawRect(context, content, foregroundDrawingType, rect2);
-    getPaintController().endScope();
+    getPaintController().endSkippingCache();
 
     EXPECT_DISPLAY_LIST(getPaintController().newDisplayItemList(), 3,
         TestDisplayItem(multicol, DisplayItem::drawingTypeToCachedDrawingType(backgroundDrawingType)),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
     EXPECT_NE(picture1, static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[1]).picture());
     EXPECT_NE(picture2, static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[2]).picture());
 
     // Now the multicol becomes 3 columns and repaints.
     multicol.setDisplayItemsUncached();
     drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 100, 100, 100));
 
-    getPaintController().beginScope();
+    getPaintController().beginSkippingCache();
     drawRect(context, content, foregroundDrawingType, rect1);
-    getPaintController().endScope();
-
-    getPaintController().beginScope();
     drawRect(context, content, foregroundDrawingType, rect2);
-    getPaintController().endScope();
-
-    getPaintController().beginScope();
     drawRect(context, content, foregroundDrawingType, rect3);
-    getPaintController().endScope();
+    getPaintController().endSkippingCache();
 
     // We should repaint everything on invalidation of the scope container.
     EXPECT_DISPLAY_LIST(getPaintController().newDisplayItemList(), 4,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
     EXPECT_NE(picture1, static_cast<const DrawingDisplayItem&>(getPaintController().newDisplayItemList()[1]).picture());
     EXPECT_NE(picture2, static_cast<const DrawingDisplayItem&>(getPaintController().newDisplayItemList()[2]).picture());
 
@@ skipping 126 matching lines @@
 
     drawPath(context, client, backgroundDrawingType, 50);
     getPaintController().commitNewDisplayItems(LayoutSize());
     EXPECT_FALSE(getPaintController().paintArtifact().isSuitableForGpuRasterization());
 }
 
 TEST_F(PaintControllerTest, IsNotSuitableForGpuRasterizationMultiplePicturesSinglePathEach)
 {
     FakeDisplayItemClient client("test client", LayoutRect(0, 0, 200, 100));
     GraphicsContext context(getPaintController());
+    getPaintController().beginSkippingCache();
 
-    for (int i = 0; i < 50; ++i) {
-        getPaintController().beginScope();
+    for (int i = 0; i < 50; ++i)
         drawPath(context, client, backgroundDrawingType, 50);
-        getPaintController().endScope();
-    }
 
+    getPaintController().endSkippingCache();
     getPaintController().commitNewDisplayItems(LayoutSize());
     EXPECT_FALSE(getPaintController().paintArtifact().isSuitableForGpuRasterization());
 }
 
 TEST_F(PaintControllerTest, IsNotSuitableForGpuRasterizationSinglePictureManyPathsTwoPaints)
 {
     FakeDisplayItemClient client("test client", LayoutRect(0, 0, 200, 100));
 
     {
         GraphicsContext context(getPaintController());
@@ skipping 66 matching lines @@
             getPaintController().createAndAppend<BeginClipPathDisplayItem>(client, path);
         drawRect(context, client, backgroundDrawingType, FloatRect(0, 0, 100, 100));
         for (int j = 0; j < 50; ++j)
             getPaintController().createAndAppend<EndClipPathDisplayItem>(client);
         getPaintController().commitNewDisplayItems(LayoutSize());
         EXPECT_FALSE(getPaintController().paintArtifact().isSuitableForGpuRasterization());
     }
 }
 
 } // namespace blink