Remove begin/end subseq. display items, and store on PaintController instead.

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

 // Copyright 2015 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/PaintLayerPainter.h"
 
 #include "core/layout/LayoutBoxModelObject.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/paint/PaintControllerPaintTest.h"
 #include "platform/graphics/GraphicsContext.h"
@@ skipping 51 matching lines @@
       "  <div id='content1' style='position: absolute; width: 100px; height: "
       "100px; background-color: red'></div>"
       "</div>"
       "<div id='container2' style='position: relative; z-index: 1; width: "
       "200px; height: 200px; background-color: blue'>"
       "  <div id='content2' style='position: absolute; width: 100px; height: "
       "100px; background-color: green'></div>"
       "</div>");
   document().view()->updateAllLifecyclePhases();
 
-  PaintLayer& htmlLayer =
-      *toLayoutBoxModelObject(document().documentElement()->layoutObject())
-           ->layer();
   LayoutObject& container1 =
       *document().getElementById("container1")->layoutObject();
-  PaintLayer& container1Layer = *toLayoutBoxModelObject(container1).layer();
   LayoutObject& content1 =
       *document().getElementById("content1")->layoutObject();
   LayoutObject& container2 =
       *document().getElementById("container2")->layoutObject();
-  PaintLayer& container2Layer = *toLayoutBoxModelObject(container2).layer();
   LayoutObject& content2 =
       *document().getElementById("content2")->layoutObject();
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-    EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 13,
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1, backgroundType),
-        TestDisplayItem(content1, backgroundType),
-        TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container2, backgroundType),
-        TestDisplayItem(content2, backgroundType),
-        TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
+    EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 5,
+                        TestDisplayItem(layoutView(), documentBackgroundType),
+                        TestDisplayItem(container1, backgroundType),
+                        TestDisplayItem(content1, backgroundType),
+                        TestDisplayItem(container2, backgroundType),
+                        TestDisplayItem(content2, backgroundType));
   } else {
-    EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 11,
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1, backgroundType),
-        TestDisplayItem(content1, backgroundType),
-        TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container2, backgroundType),
-        TestDisplayItem(content2, backgroundType),
-        TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+    EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 5,
+                        TestDisplayItem(layoutView(), documentBackgroundType),
+                        TestDisplayItem(container1, backgroundType),
+                        TestDisplayItem(content1, backgroundType),
+                        TestDisplayItem(container2, backgroundType),
+                        TestDisplayItem(content2, backgroundType));
   }
 
   toHTMLElement(content1.node())
       ->setAttribute(HTMLNames::styleAttr,
                      "position: absolute; width: 100px; height: 100px; "
                      "background-color: green");
   document().view()->updateAllLifecyclePhasesExceptPaint();
   EXPECT_TRUE(paintWithoutCommit());
 
-  EXPECT_EQ(6, numCachedNewItems());
+  EXPECT_EQ(4, numCachedNewItems());
 
   commit();
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-    EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 13,
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1, backgroundType),
-        TestDisplayItem(content1, backgroundType),
-        TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container2, backgroundType),
-        TestDisplayItem(content2, backgroundType),
-        TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
+    EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 5,
+                        TestDisplayItem(layoutView(), documentBackgroundType),
+                        TestDisplayItem(container1, backgroundType),
+                        TestDisplayItem(content1, backgroundType),
+                        TestDisplayItem(container2, backgroundType),
+                        TestDisplayItem(content2, backgroundType));
   } else {
-    EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 11,
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1, backgroundType),
-        TestDisplayItem(content1, backgroundType),
-        TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container2, backgroundType),
-        TestDisplayItem(content2, backgroundType),
-        TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+    EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 5,
+                        TestDisplayItem(layoutView(), documentBackgroundType),
+                        TestDisplayItem(container1, backgroundType),
+                        TestDisplayItem(content1, backgroundType),
+                        TestDisplayItem(container2, backgroundType),
+                        TestDisplayItem(content2, backgroundType));
   }
 }
 
 TEST_P(PaintLayerPainterTest, CachedSubsequenceForSVGRoot) {
   setBodyInnerHTML(
       "<svg id='svg' style='position: relative'>"
       "  <rect id='rect' x='10' y='10' width='100' height='100' rx='15' "
       "ry='15'/>"
       "</svg>"
       "<div id='div' style='position: relative; width: 50x; height: "
       "50px'></div>");
   document().view()->updateAllLifecyclePhases();
 
-  PaintLayer& htmlLayer =
-      *toLayoutBoxModelObject(document().documentElement()->layoutObject())
-           ->layer();
   LayoutObject& svg = *document().getElementById("svg")->layoutObject();
-  PaintLayer& svgLayer = *toLayoutBoxModelObject(svg).layer();
   LayoutObject& rect = *document().getElementById("rect")->layoutObject();
   LayoutObject& div = *document().getElementById("div")->layoutObject();
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     // SPv2 slips the clip box (see BoxClipper).
-    EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 8,
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(svgLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(rect, foregroundType),
-        TestDisplayItem(svgLayer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
+    EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 2,
+                        TestDisplayItem(layoutView(), documentBackgroundType),
+                        TestDisplayItem(rect, foregroundType));
   } else {
     EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 10,
+        rootPaintController().getDisplayItemList(), 6,
         TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(svgLayer, DisplayItem::kSubsequence),
         TestDisplayItem(svg, DisplayItem::kClipLayerForeground),
         TestDisplayItem(svg, DisplayItem::kBeginTransform),
         TestDisplayItem(rect, foregroundType),
         TestDisplayItem(svg, DisplayItem::kEndTransform),
         TestDisplayItem(svg, DisplayItem::clipTypeToEndClipType(
-                                 DisplayItem::kClipLayerForeground)),
-        TestDisplayItem(svgLayer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+                                 DisplayItem::kClipLayerForeground)));
   }
 
   // Change the color of the div. This should not invalidate the subsequence
   // for the SVG root.
   toHTMLElement(div.node())
       ->setAttribute(HTMLNames::styleAttr,
                      "position: relative; width: 50x; height: 50px; "
                      "background-color: green");
   document().view()->updateAllLifecyclePhasesExceptPaint();
   EXPECT_TRUE(paintWithoutCommit());
 
   // Reuse of SVG and document background. 2 fewer with SPv2 enabled because
   // clip display items don't appear in SPv2 display lists.
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
-    EXPECT_EQ(4, numCachedNewItems());
+    EXPECT_EQ(2, numCachedNewItems());
   else
-    EXPECT_EQ(8, numCachedNewItems());
+    EXPECT_EQ(6, numCachedNewItems());
 
   commit();
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-    EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 9,
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(svgLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(rect, foregroundType),
-        TestDisplayItem(svgLayer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(div, backgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
+    EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 3,
+                        TestDisplayItem(layoutView(), documentBackgroundType),
+                        TestDisplayItem(rect, foregroundType),
+                        TestDisplayItem(div, backgroundType));
   } else {
     EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 11,
+        rootPaintController().getDisplayItemList(), 7,
         TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(svgLayer, DisplayItem::kSubsequence),
         TestDisplayItem(svg, DisplayItem::kClipLayerForeground),
         TestDisplayItem(svg, DisplayItem::kBeginTransform),
         TestDisplayItem(rect, foregroundType),
         TestDisplayItem(svg, DisplayItem::kEndTransform),
         TestDisplayItem(svg, DisplayItem::clipTypeToEndClipType(
                                  DisplayItem::kClipLayerForeground)),
-        TestDisplayItem(svgLayer, DisplayItem::kEndSubsequence),
         TestDisplayItem(div, backgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
         TestDisplayItem(layoutView(),
                         DisplayItem::clipTypeToEndClipType(
                             DisplayItem::kClipFrameToVisibleContentRect)));
   }
 }
 
 TEST_P(PaintLayerPainterTest, CachedSubsequenceOnInterestRectChange) {
   // TODO(wangxianzhu): SPv2 deals with interest rect differently, so disable
   // this test for SPv2 temporarily.
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
@@ skipping 12 matching lines @@
       "  <div id='content2b' style='position: absolute; top: 200px; width: "
       "100px; height: 100px; background-color: green'></div>"
       "</div>"
       "<div id='container3' style='position: absolute; z-index: 2; left: "
       "300px; top: 0; width: 200px; height: 200px; background-color: blue'>"
       "  <div id='content3' style='position: absolute; width: 200px; height: "
       "200px; background-color: green'></div>"
       "</div>");
   rootPaintController().invalidateAll();
 
-  PaintLayer& htmlLayer =
-      *toLayoutBoxModelObject(document().documentElement()->layoutObject())
-           ->layer();
   LayoutObject& container1 =
       *document().getElementById("container1")->layoutObject();
-  PaintLayer& container1Layer = *toLayoutBoxModelObject(container1).layer();
   LayoutObject& content1 =
       *document().getElementById("content1")->layoutObject();
   LayoutObject& container2 =
       *document().getElementById("container2")->layoutObject();
-  PaintLayer& container2Layer = *toLayoutBoxModelObject(container2).layer();
   LayoutObject& content2a =
       *document().getElementById("content2a")->layoutObject();
   LayoutObject& content2b =
       *document().getElementById("content2b")->layoutObject();
   LayoutObject& container3 =
       *document().getElementById("container3")->layoutObject();
-  PaintLayer& container3Layer = *toLayoutBoxModelObject(container3).layer();
   LayoutObject& content3 =
       *document().getElementById("content3")->layoutObject();
 
   document().view()->updateAllLifecyclePhasesExceptPaint();
   IntRect interestRect(0, 0, 400, 300);
   paint(&interestRect);
 
   // Container1 is fully in the interest rect;
   // Container2 is partly (including its stacking chidren) in the interest rect;
   // Content2b is out of the interest rect and output nothing;
   // Container3 is partly in the interest rect.
-  EXPECT_DISPLAY_LIST(
-      rootPaintController().getDisplayItemList(), 15,
-      TestDisplayItem(layoutView(), documentBackgroundType),
-      TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-      TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
-      TestDisplayItem(container1, backgroundType),
-      TestDisplayItem(content1, backgroundType),
-      TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
-      TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
-      TestDisplayItem(container2, backgroundType),
-      TestDisplayItem(content2a, backgroundType),
-      TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
-      TestDisplayItem(container3Layer, DisplayItem::kSubsequence),
-      TestDisplayItem(container3, backgroundType),
-      TestDisplayItem(content3, backgroundType),
-      TestDisplayItem(container3Layer, DisplayItem::kEndSubsequence),
-      TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+  EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 7,
+                      TestDisplayItem(layoutView(), documentBackgroundType),
+                      TestDisplayItem(container1, backgroundType),
+                      TestDisplayItem(content1, backgroundType),
+                      TestDisplayItem(container2, backgroundType),
+                      TestDisplayItem(content2a, backgroundType),
+                      TestDisplayItem(container3, backgroundType),
+                      TestDisplayItem(content3, backgroundType));
 
   document().view()->updateAllLifecyclePhasesExceptPaint();
   IntRect newInterestRect(0, 100, 300, 1000);
   EXPECT_TRUE(paintWithoutCommit(&newInterestRect));
 
   // Container1 becomes partly in the interest rect, but uses cached subsequence
   // because it was fully painted before;
   // Container2's intersection with the interest rect changes;
   // Content2b is out of the interest rect and outputs nothing;
   // Container3 becomes out of the interest rect and outputs empty subsequence
   // pair.
-  EXPECT_EQ(7, numCachedNewItems());
+  EXPECT_EQ(5, numCachedNewItems());
 
   commit();
 
-  EXPECT_DISPLAY_LIST(
-      rootPaintController().getDisplayItemList(), 14,
-      TestDisplayItem(layoutView(), documentBackgroundType),
-      TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-      TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
-      TestDisplayItem(container1, backgroundType),
-      TestDisplayItem(content1, backgroundType),
-      TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
-      TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
-      TestDisplayItem(container2, backgroundType),
-      TestDisplayItem(content2a, backgroundType),
-      TestDisplayItem(content2b, backgroundType),
-      TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
-      TestDisplayItem(container3Layer, DisplayItem::kSubsequence),
-      TestDisplayItem(container3Layer, DisplayItem::kEndSubsequence),
-      TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+  EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 6,
+                      TestDisplayItem(layoutView(), documentBackgroundType),
+                      TestDisplayItem(container1, backgroundType),
+                      TestDisplayItem(content1, backgroundType),
+                      TestDisplayItem(container2, backgroundType),
+                      TestDisplayItem(content2a, backgroundType),
+                      TestDisplayItem(content2b, backgroundType));
 }
 
 TEST_P(PaintLayerPainterTest,
        CachedSubsequenceOnStyleChangeWithInterestRectClipping) {
   setBodyInnerHTML(
       "<div id='container1' style='position: relative; z-index: 1; width: "
       "200px; height: 200px; background-color: blue'>"
       "  <div id='content1' style='position: absolute; width: 100px; height: "
       "100px; background-color: red'></div>"
       "</div>"
       "<div id='container2' style='position: relative; z-index: 1; width: "
       "200px; height: 200px; background-color: blue'>"
       "  <div id='content2' style='position: absolute; width: 100px; height: "
       "100px; background-color: green'></div>"
       "</div>");
   document().view()->updateAllLifecyclePhasesExceptPaint();
   // PaintResult of all subsequences will be MayBeClippedByPaintDirtyRect.
   IntRect interestRect(0, 0, 50, 300);
   paint(&interestRect);
 
-  PaintLayer& htmlLayer =
-      *toLayoutBoxModelObject(document().documentElement()->layoutObject())
-           ->layer();
   LayoutObject& container1 =
       *document().getElementById("container1")->layoutObject();
-  PaintLayer& container1Layer = *toLayoutBoxModelObject(container1).layer();
   LayoutObject& content1 =
       *document().getElementById("content1")->layoutObject();
   LayoutObject& container2 =
       *document().getElementById("container2")->layoutObject();
-  PaintLayer& container2Layer = *toLayoutBoxModelObject(container2).layer();
   LayoutObject& content2 =
       *document().getElementById("content2")->layoutObject();
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-    EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 13,
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1, backgroundType),
-        TestDisplayItem(content1, backgroundType),
-        TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container2, backgroundType),
-        TestDisplayItem(content2, backgroundType),
-        TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
+    EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 5,
+                        TestDisplayItem(layoutView(), documentBackgroundType),
+                        TestDisplayItem(container1, backgroundType),
+                        TestDisplayItem(content1, backgroundType),
+                        TestDisplayItem(container2, backgroundType),
+                        TestDisplayItem(content2, backgroundType));
   } else {
-    EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 11,
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1, backgroundType),
-        TestDisplayItem(content1, backgroundType),
-        TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container2, backgroundType),
-        TestDisplayItem(content2, backgroundType),
-        TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+    EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 5,
+                        TestDisplayItem(layoutView(), documentBackgroundType),
+                        TestDisplayItem(container1, backgroundType),
+                        TestDisplayItem(content1, backgroundType),
+                        TestDisplayItem(container2, backgroundType),
+                        TestDisplayItem(content2, backgroundType));
   }
 
   toHTMLElement(content1.node())
       ->setAttribute(HTMLNames::styleAttr,
                      "position: absolute; width: 100px; height: 100px; "
                      "background-color: green");
   document().view()->updateAllLifecyclePhasesExceptPaint();
   EXPECT_TRUE(paintWithoutCommit(&interestRect));
 
-  EXPECT_EQ(6, numCachedNewItems());
+  EXPECT_EQ(4, numCachedNewItems());
 
   commit();
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-    EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 13,
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1, backgroundType),
-        TestDisplayItem(content1, backgroundType),
-        TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container2, backgroundType),
-        TestDisplayItem(content2, backgroundType),
-        TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
+    EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 5,
+                        TestDisplayItem(layoutView(), documentBackgroundType),
+                        TestDisplayItem(container1, backgroundType),
+                        TestDisplayItem(content1, backgroundType),
+                        TestDisplayItem(container2, backgroundType),
+                        TestDisplayItem(content2, backgroundType));
   } else {
-    EXPECT_DISPLAY_LIST(
-        rootPaintController().getDisplayItemList(), 11,
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container1, backgroundType),
-        TestDisplayItem(content1, backgroundType),
-        TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
-        TestDisplayItem(container2, backgroundType),
-        TestDisplayItem(content2, backgroundType),
-        TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
-        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+    EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 5,
+                        TestDisplayItem(layoutView(), documentBackgroundType),
+                        TestDisplayItem(container1, backgroundType),
+                        TestDisplayItem(content1, backgroundType),
+                        TestDisplayItem(container2, backgroundType),
+                        TestDisplayItem(content2, backgroundType));
   }
 }
 
 TEST_P(PaintLayerPainterTest, PaintPhaseOutline) {
   AtomicString styleWithoutOutline =
       "width: 50px; height: 50px; background-color: green";
   AtomicString styleWithOutline =
       "outline: 1px solid blue; " + styleWithoutOutline;
   setBodyInnerHTML(
       "<div id='self-painting-layer' style='position: absolute'>"
@@ skipping 487 matching lines @@
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     EXPECT_TRUE(
         PaintLayerPainter(*targetLayer).paintedOutputInvisible(paintingInfo));
   } else {
     EXPECT_FALSE(
         PaintLayerPainter(*targetLayer).paintedOutputInvisible(paintingInfo));
   }
 }
 
 }  // namespace blink