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

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 18 matching lines @@
        FullDocumentPaintingWithCaret) {
   setBodyInnerHTML(
       "<div id='div' contentEditable='true' style='outline:none'>XYZ</div>");
   document().page()->focusController().setActive(true);
   document().page()->focusController().setFocused(true);
   Element& div = *toElement(document().body()->firstChild());
   InlineTextBox& textInlineBox =
       *toLayoutText(div.firstChild()->layoutObject())->firstTextBox();
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-    if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
-      EXPECT_DISPLAY_LIST(
-          rootPaintController().getDisplayItemList(), 4,
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-          TestDisplayItem(layoutView(), documentBackgroundType),
-          TestDisplayItem(textInlineBox, foregroundType),
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
-    } else {
-      EXPECT_DISPLAY_LIST(
-          rootPaintController().getDisplayItemList(), 6,
-          TestDisplayItem(layoutView(),
-                          DisplayItem::kClipFrameToVisibleContentRect),
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-          TestDisplayItem(layoutView(), documentBackgroundType),
-          TestDisplayItem(textInlineBox, foregroundType),
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
-          TestDisplayItem(layoutView(),
-                          DisplayItem::clipTypeToEndClipType(
-                              DisplayItem::kClipFrameToVisibleContentRect)));
-    }
+    EXPECT_DISPLAY_LIST(
+        rootPaintController().getDisplayItemList(), 4,
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+        TestDisplayItem(layoutView(), documentBackgroundType),
+        TestDisplayItem(textInlineBox, foregroundType),
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
   } else {
     EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 2,
                         TestDisplayItem(layoutView(), documentBackgroundType),
                         TestDisplayItem(textInlineBox, foregroundType));
   }
 
   div.focus();
   document().view()->updateAllLifecyclePhases();
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-    if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
-      EXPECT_DISPLAY_LIST(
-          rootPaintController().getDisplayItemList(), 5,
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-          TestDisplayItem(layoutView(), documentBackgroundType),
-          TestDisplayItem(textInlineBox, foregroundType),
-          TestDisplayItem(document()
-                              .frame()
-                              ->selection()
-                              .caretDisplayItemClientForTesting(),
-                          DisplayItem::kCaret),  // New!
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
-    } else {
-      EXPECT_DISPLAY_LIST(
-          rootPaintController().getDisplayItemList(), 7,
-          TestDisplayItem(layoutView(),
-                          DisplayItem::kClipFrameToVisibleContentRect),
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-          TestDisplayItem(layoutView(), documentBackgroundType),
-          TestDisplayItem(textInlineBox, foregroundType),
-          TestDisplayItem(document()
-                              .frame()
-                              ->selection()
-                              .caretDisplayItemClientForTesting(),
-                          DisplayItem::kCaret),  // New!
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
-          TestDisplayItem(layoutView(),
-                          DisplayItem::clipTypeToEndClipType(
-                              DisplayItem::kClipFrameToVisibleContentRect)));
-    }
+    EXPECT_DISPLAY_LIST(
+        rootPaintController().getDisplayItemList(), 5,
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+        TestDisplayItem(layoutView(), documentBackgroundType),
+        TestDisplayItem(textInlineBox, foregroundType),
+        TestDisplayItem(
+            document().frame()->selection().caretDisplayItemClientForTesting(),
+            DisplayItem::kCaret),  // New!
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
   } else {
     EXPECT_DISPLAY_LIST(
         rootPaintController().getDisplayItemList(), 3,
         TestDisplayItem(layoutView(), documentBackgroundType),
         TestDisplayItem(textInlineBox, foregroundType),
         TestDisplayItem(
             document().frame()->selection().caretDisplayItemClientForTesting(),
             DisplayItem::kCaret));  // New!
   }
 }
 
 TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2, InlineRelayout) {
   setBodyInnerHTML(
       "<div id='div' style='width:100px; height: 200px'>AAAAAAAAAA "
       "BBBBBBBBBB</div>");
   Element& div = *toElement(document().body()->firstChild());
   LayoutBlock& divBlock =
       *toLayoutBlock(document().body()->firstChild()->layoutObject());
   LayoutText& text = *toLayoutText(divBlock.firstChild());
   InlineTextBox& firstTextBox = *text.firstTextBox();
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-    if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
-      EXPECT_DISPLAY_LIST(
-          rootPaintController().getDisplayItemList(), 4,
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-          TestDisplayItem(layoutView(), documentBackgroundType),
-          TestDisplayItem(firstTextBox, foregroundType),
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
-    } else {
-      EXPECT_DISPLAY_LIST(
-          rootPaintController().getDisplayItemList(), 6,
-          TestDisplayItem(layoutView(),
-                          DisplayItem::kClipFrameToVisibleContentRect),
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-          TestDisplayItem(layoutView(), documentBackgroundType),
-          TestDisplayItem(firstTextBox, foregroundType),
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
-          TestDisplayItem(layoutView(),
-                          DisplayItem::clipTypeToEndClipType(
-                              DisplayItem::kClipFrameToVisibleContentRect)));
-    }
+    EXPECT_DISPLAY_LIST(
+        rootPaintController().getDisplayItemList(), 4,
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+        TestDisplayItem(layoutView(), documentBackgroundType),
+        TestDisplayItem(firstTextBox, foregroundType),
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
   } else {
     EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 2,
                         TestDisplayItem(layoutView(), documentBackgroundType),
                         TestDisplayItem(firstTextBox, foregroundType));
   }
 
   div.setAttribute(HTMLNames::styleAttr, "width: 10px; height: 200px");
   document().view()->updateAllLifecyclePhases();
 
   LayoutText& newText = *toLayoutText(divBlock.firstChild());
   InlineTextBox& newFirstTextBox = *newText.firstTextBox();
   InlineTextBox& secondTextBox = *newText.firstTextBox()->nextTextBox();
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-    if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
-      EXPECT_DISPLAY_LIST(
-          rootPaintController().getDisplayItemList(), 5,
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-          TestDisplayItem(layoutView(), documentBackgroundType),
-          TestDisplayItem(newFirstTextBox, foregroundType),
-          TestDisplayItem(secondTextBox, foregroundType),
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
-    } else {
-      EXPECT_DISPLAY_LIST(
-          rootPaintController().getDisplayItemList(), 7,
-          TestDisplayItem(layoutView(),
-                          DisplayItem::kClipFrameToVisibleContentRect),
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-          TestDisplayItem(layoutView(), documentBackgroundType),
-          TestDisplayItem(newFirstTextBox, foregroundType),
-          TestDisplayItem(secondTextBox, foregroundType),
-          TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
-          TestDisplayItem(layoutView(),
-                          DisplayItem::clipTypeToEndClipType(
-                              DisplayItem::kClipFrameToVisibleContentRect)));
-    }
+    EXPECT_DISPLAY_LIST(
+        rootPaintController().getDisplayItemList(), 5,
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+        TestDisplayItem(layoutView(), documentBackgroundType),
+        TestDisplayItem(newFirstTextBox, foregroundType),
+        TestDisplayItem(secondTextBox, foregroundType),
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
   } else {
     EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 3,
                         TestDisplayItem(layoutView(), documentBackgroundType),
                         TestDisplayItem(newFirstTextBox, foregroundType),
                         TestDisplayItem(secondTextBox, foregroundType));
   }
 }
 
 TEST_P(PaintControllerPaintTestForSlimmingPaintV2, ChunkIdClientCacheFlag) {
   setBodyInnerHTML(
       "<div id='div' style='width: 200px; height: 200px; opacity: 0.5'>"
       "  <div style='width: 100px; height: 100px; background-color: "
       "blue'></div>"
       "  <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();
   LayoutObject& subDiv2 = *subDiv.nextSibling();
-  if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
-    EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 9,
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(div, DisplayItem::kBeginCompositing),
-        TestDisplayItem(subDiv, backgroundType),
-        TestDisplayItem(subDiv2, backgroundType),
-        TestDisplayItem(div, DisplayItem::kEndCompositing),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
-  } else {
-    EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 11,
-        TestDisplayItem(layoutView(),
-                        DisplayItem::kClipFrameToVisibleContentRect),
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(div, DisplayItem::kBeginCompositing),
-        TestDisplayItem(subDiv, backgroundType),
-        TestDisplayItem(subDiv2, backgroundType),
-        TestDisplayItem(div, DisplayItem::kEndCompositing),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
-        TestDisplayItem(layoutView(),
-                        DisplayItem::clipTypeToEndClipType(
-                            DisplayItem::kClipFrameToVisibleContentRect)));
-  }
+  EXPECT_DISPLAY_LIST(
+      rootPaintController().getDisplayItemList(), 7,
+      TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+      TestDisplayItem(layoutView(), documentBackgroundType),
+      TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+      TestDisplayItem(subDiv, backgroundType),
+      TestDisplayItem(subDiv2, backgroundType),
+      TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
+      TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
 
   // Verify that the background does not scroll.
   const PaintChunk& backgroundChunk = rootPaintController().paintChunks()[0];
   EXPECT_FALSE(backgroundChunk.properties.propertyTreeState.transform()
                    ->isScrollTranslation());
 
   const EffectPaintPropertyNode* effectNode = div.paintProperties()->effect();
   EXPECT_EQ(0.5f, effectNode->opacity());
 
-  // When RLS is enabled, an additional paint chunk will be created for the
-  // LayoutView's layer.
-  unsigned divChunkIndex =
-      RuntimeEnabledFeatures::rootLayerScrollingEnabled() ? 2 : 1;
-  const PaintChunk& chunk = rootPaintController().paintChunks()[divChunkIndex];
+  const PaintChunk& chunk = rootPaintController().paintChunks()[1];
   EXPECT_EQ(*div.layer(), chunk.id->client);
   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, 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(), 8,
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        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(), 10,
-        TestDisplayItem(layoutView(),
-                        DisplayItem::kClipFrameToVisibleContentRect),
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        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)));
-  }
+  EXPECT_DISPLAY_LIST(
+      rootPaintController().getDisplayItemList(), 6,
+      TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+      TestDisplayItem(layoutView(), documentBackgroundType),
+      TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+      TestDisplayItem(subDiv, backgroundType),
+      TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
+      TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
 }
 
 }  // namespace blink