[SPv2] Disable CompositingRecorder collapsing for SPv2

third_party/WebKit/Source/core/paint/PaintControllerPaintTest.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 "core/paint/PaintControllerPaintTest.h"
 
 #include "core/editing/FrameCaret.h"
 #include "core/editing/FrameSelection.h"
 #include "core/layout/LayoutText.h"
 #include "core/layout/line/InlineTextBox.h"
@@ skipping 224 matching lines @@
   EXPECT_EQ(effectNode, chunk.properties.propertyTreeState.effect());
 
   EXPECT_FALSE(div.layer()->isJustCreated());
   // Client used by only paint chunks and non-cachaeable display items but not
   // by any cacheable display items won't be marked as validly cached.
   EXPECT_FALSE(rootPaintController().clientCacheIsValid(*div.layer()));
   EXPECT_FALSE(rootPaintController().clientCacheIsValid(div));
   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: "
       "blue'></div>"
       "</div>");
   PaintLayer& htmlLayer =
       *toLayoutBoxModelObject(document().documentElement()->layoutObject())
            ->layer();
   LayoutBlock& div = *toLayoutBlock(getLayoutObjectByElementId("div"));
   LayoutObject& subDiv = *div.firstChild();
 
   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(),
                         DisplayItem::clipTypeToEndClipType(
                             DisplayItem::kClipFrameToVisibleContentRect)));
   }
 }
 
 }  // namespace blink