[SPv2] Disable CompositingRecorder collapsing for SPv2

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

Index: third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
index 0db07cc1d794a8a1b6394c95f614861d4c2c2df3..a7561a22b6f84c11d40038758d938f3cdc654da9 100644
--- a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
@@ -242,7 +242,7 @@ TEST_P(PaintControllerPaintTestForSlimmingPaintV2, ChunkIdClientCacheFlag) {
   EXPECT_TRUE(rootPaintController().clientCacheIsValid(subDiv));
 }
 
-TEST_P(PaintControllerPaintTestForSlimmingPaintV2, CompositingFold) {
+TEST_P(PaintControllerPaintTestForSlimmingPaintV2, CompositingNoFold) {
   setBodyInnerHTML(
       "<div id='div' style='width: 200px; height: 200px; opacity: 0.5'>"
       "  <div style='width: 100px; height: 100px; background-color: "
@@ -256,28 +256,26 @@ TEST_P(PaintControllerPaintTestForSlimmingPaintV2, CompositingFold) {
 
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 6,
+        rootPaintController().getDisplayItemList(), 8,
         TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
         TestDisplayItem(layoutView(), documentBackgroundType),
         TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        // The begin and end compositing display items have been folded into
-        // this
-        // one.
+        TestDisplayItem(div, DisplayItem::kBeginCompositing),
         TestDisplayItem(subDiv, backgroundType),
+        TestDisplayItem(div, DisplayItem::kEndCompositing),
         TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
         TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
   } else {
     EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 8,
+        rootPaintController().getDisplayItemList(), 10,
         TestDisplayItem(layoutView(),
                         DisplayItem::kClipFrameToVisibleContentRect),
         TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
         TestDisplayItem(layoutView(), documentBackgroundType),
         TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        // The begin and end compositing display items have been folded into
-        // this
-        // one.
+        TestDisplayItem(div, DisplayItem::kBeginCompositing),
         TestDisplayItem(subDiv, backgroundType),
+        TestDisplayItem(div, DisplayItem::kEndCompositing),
         TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
         TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
         TestDisplayItem(layoutView(),