[SPv2] Stop recording paired display items (except for subsequence markers)

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/ClipPathDisplayItem.h"
 #include "platform/graphics/paint/ClipPathRecorder.h"
@@ skipping 140 matching lines @@
   FakeDisplayItemClient client("client", LayoutRect(100, 100, 200, 200));
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     getPaintController().updateCurrentPaintChunkProperties(
         &m_rootPaintChunkId, defaultPaintChunkProperties());
   }
 
   drawClippedRect(context, client, clipType, backgroundDrawingType,
                   FloatRect(100, 100, 200, 200));
   getPaintController().commitNewDisplayItems();
 
-  EXPECT_DISPLAY_LIST(
-      getPaintController().getDisplayItemList(), 3,
-      TestDisplayItem(client, clipType),
-      TestDisplayItem(client, backgroundDrawingType),
-      TestDisplayItem(client, DisplayItem::clipTypeToEndClipType(clipType)));
+  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+    EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 1,
+                        TestDisplayItem(client, backgroundDrawingType));
 
-  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     EXPECT_EQ(1u, getPaintController().paintChunks().size());
     EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects,
                 UnorderedElementsAre(FloatRect(LayoutRect::infiniteIntRect())));
+  } else {
+    EXPECT_DISPLAY_LIST(
+        getPaintController().getDisplayItemList(), 3,
+        TestDisplayItem(client, clipType),
+        TestDisplayItem(client, backgroundDrawingType),
+        TestDisplayItem(client, DisplayItem::clipTypeToEndClipType(clipType)));
   }
 }
 
 TEST_P(PaintControllerTest, UpdateBasic) {
   FakeDisplayItemClient first("first", LayoutRect(100, 100, 300, 300));
   FakeDisplayItemClient second("second", LayoutRect(100, 100, 200, 200));
   GraphicsContext context(getPaintController());
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     getPaintController().updateCurrentPaintChunkProperties(
         &m_rootPaintChunkId, defaultPaintChunkProperties());
@@ skipping 509 matching lines @@
       getPaintController().updateCurrentPaintChunkProperties(&id, properties);
     }
     ClipRecorder clipRecorder(context, first, clipType, IntRect(1, 1, 2, 2));
     drawRect(context, first, backgroundDrawingType,
              FloatRect(100, 100, 150, 150));
     drawRect(context, second, backgroundDrawingType,
              FloatRect(100, 100, 200, 200));
   }
   getPaintController().commitNewDisplayItems();
 
-  EXPECT_DISPLAY_LIST(
-      getPaintController().getDisplayItemList(), 4,
-      TestDisplayItem(first, clipType),
-      TestDisplayItem(first, backgroundDrawingType),
-      TestDisplayItem(second, backgroundDrawingType),
-      TestDisplayItem(first, DisplayItem::clipTypeToEndClipType(clipType)));
+  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+    EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 2,
+                        TestDisplayItem(first, backgroundDrawingType),
+                        TestDisplayItem(second, backgroundDrawingType));
 
-  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     getPaintController().updateCurrentPaintChunkProperties(
         &m_rootPaintChunkId, defaultPaintChunkProperties());
+  } else {
+    EXPECT_DISPLAY_LIST(
+        getPaintController().getDisplayItemList(), 4,
+        TestDisplayItem(first, clipType),
+        TestDisplayItem(first, backgroundDrawingType),
+        TestDisplayItem(second, backgroundDrawingType),
+        TestDisplayItem(first, DisplayItem::clipTypeToEndClipType(clipType)));
   }
 
   first.setDisplayItemsUncached();
   drawRect(context, first, backgroundDrawingType,
            FloatRect(100, 100, 150, 150));
   drawRect(context, second, backgroundDrawingType,
            FloatRect(100, 100, 200, 200));
 
   EXPECT_EQ(1, numCachedNewItems());
 #ifndef NDEBUG
@@ skipping 32 matching lines @@
       properties.propertyTreeState.setClip(clip2.get());
 
       getPaintController().updateCurrentPaintChunkProperties(&id, properties);
     }
     ClipRecorder clipRecorder(context, second, clipType, IntRect(1, 1, 2, 2));
     drawRect(context, second, backgroundDrawingType,
              FloatRect(100, 100, 200, 200));
   }
   getPaintController().commitNewDisplayItems();
 
-  EXPECT_DISPLAY_LIST(
-      getPaintController().getDisplayItemList(), 4,
-      TestDisplayItem(first, backgroundDrawingType),
-      TestDisplayItem(second, clipType),
-      TestDisplayItem(second, backgroundDrawingType),
-      TestDisplayItem(second, DisplayItem::clipTypeToEndClipType(clipType)));
+  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+    EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 2,
+                        TestDisplayItem(first, backgroundDrawingType),
+                        TestDisplayItem(second, backgroundDrawingType));
 
-  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     EXPECT_EQ(2u, getPaintController().paintChunks().size());
     EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects,
                 UnorderedElementsAre(FloatRect(
                     100, 100, 200,
                     200)));  // |second| disappeared from the first chunk.
     EXPECT_THAT(getPaintController().paintChunks()[1].rasterInvalidationRects,
                 UnorderedElementsAre(FloatRect(
                     LayoutRect::infiniteIntRect())));  // This is a new chunk.
+  } else {
+    EXPECT_DISPLAY_LIST(
+        getPaintController().getDisplayItemList(), 4,
+        TestDisplayItem(first, backgroundDrawingType),
+        TestDisplayItem(second, clipType),
+        TestDisplayItem(second, backgroundDrawingType),
+        TestDisplayItem(second, DisplayItem::clipTypeToEndClipType(clipType)));
   }
 }
 
 TEST_P(PaintControllerTest, CachedDisplayItems) {
   FakeDisplayItemClient first("first");
   FakeDisplayItemClient second("second");
   GraphicsContext context(getPaintController());
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     getPaintController().updateCurrentPaintChunkProperties(
         &m_rootPaintChunkId, defaultPaintChunkProperties());
@@ skipping 1516 matching lines @@
 }
 
 TEST_F(PaintControllerUnderInvalidationTest,
        FoldCompositingDrawingInSubsequence) {
   testFoldCompositingDrawingInSubsequence();
 }
 
 #endif  // defined(GTEST_HAS_DEATH_TEST) && !OS(ANDROID)
 
 }  // namespace blink