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

third_party/WebKit/Source/core/paint/TablePainterTest.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/PaintControllerPaintTest.h"
 #include "core/paint/PaintLayerPainter.h"
 
 // This file contains tests testing TablePainter, TableSectionPainter,
 // TableRowPainter and TableCellPainter. It's difficult to separate the tests
 // into individual files because of dependencies among the painter classes.
@@ skipping 104 matching lines @@
       "separate; }"
       "</style>"
       "<table>"
       "  <tr id='row'><td id='cell1'><td id='cell2'></td></tr>"
       "</table>");
 
   LayoutView& layoutView = *document().layoutView();
   LayoutObject& cell1 = *getLayoutObjectByElementId("cell1");
   LayoutObject& cell2 = *getLayoutObjectByElementId("cell2");
   LayoutObject& row = *getLayoutObjectByElementId("row");
+  PaintLayer& htmlLayer =
+      *toLayoutBoxModelObject(document().documentElement()->layoutObject())
+           ->layer();
 
   rootPaintController().invalidateAll();
   document().view()->updateAllLifecyclePhasesExceptPaint();
   // Intersects cell1 and the spacing between cell1 and cell2.
   IntRect interestRect(200, 0, 200, 200);
   paint(&interestRect);
 
   EXPECT_DISPLAY_LIST(
-      rootPaintController().getDisplayItemList(), 5,
+      rootPaintController().getDisplayItemList(), 7,
       TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
+      TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
       TestDisplayItem(row, DisplayItem::kBeginCompositing),
       TestDisplayItem(row, DisplayItem::kBoxDecorationBackground),
       TestDisplayItem(cell1, DisplayItem::kBoxDecorationBackground),
-      TestDisplayItem(row, DisplayItem::kEndCompositing));
+      TestDisplayItem(row, DisplayItem::kEndCompositing),
+      TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
 
   document().view()->updateAllLifecyclePhasesExceptPaint();
   // Intersects the spacing only.
   interestRect = IntRect(300, 0, 100, 100);
   paint(&interestRect);
 
   EXPECT_DISPLAY_LIST(
-      rootPaintController().getDisplayItemList(), 1,
-      TestDisplayItem(layoutView, DisplayItem::kDocumentBackground));
+      rootPaintController().getDisplayItemList(), 3,
+      TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
+      TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+      TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
 
   document().view()->updateAllLifecyclePhasesExceptPaint();
   // Intersects cell2 only.
   interestRect = IntRect(450, 0, 200, 200);
   paint(&interestRect);
 
   EXPECT_DISPLAY_LIST(
-      rootPaintController().getDisplayItemList(), 5,
+      rootPaintController().getDisplayItemList(), 7,
       TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
+      TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
       TestDisplayItem(row, DisplayItem::kBeginCompositing),
       TestDisplayItem(row, DisplayItem::kBoxDecorationBackground),
       TestDisplayItem(cell2, DisplayItem::kBoxDecorationBackground),
-      TestDisplayItem(row, DisplayItem::kEndCompositing));
+      TestDisplayItem(row, DisplayItem::kEndCompositing),
+      TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
 }
 
 TEST_F(TablePainterTest, CollapsedBorderAndOverflow) {
   setBodyInnerHTML(
       "<style>"
       "  body { margin: 0 }"
       "  td { width: 100px; height: 100px; border: 100px solid blue; outline: "
       "100px solid yellow; background: green; }"
       "  table { margin: 100px; border-collapse: collapse; }"
       "</style>"
@@ skipping 14 matching lines @@
   EXPECT_DISPLAY_LIST(
       rootPaintController().getDisplayItemList(), 4,
       TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
       TestDisplayItem(cell, DisplayItem::kBoxDecorationBackground),
       TestDisplayItem(cell, DisplayItem::kTableCollapsedBorderLast),
       TestDisplayItem(cell, DisplayItem::paintPhaseToDrawingType(
                                 PaintPhaseSelfOutlineOnly)));
 }
 
 }  // namespace blink