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

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

Index: third_party/WebKit/Source/core/paint/TablePainterTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/TablePainterTest.cpp b/third_party/WebKit/Source/core/paint/TablePainterTest.cpp
index 0457359a885e989624f4034f4fbed945ce1258ed..775d04c7078c001254c16b20e58baaf1bc5d8741 100644
--- a/third_party/WebKit/Source/core/paint/TablePainterTest.cpp
+++ b/third_party/WebKit/Source/core/paint/TablePainterTest.cpp
@@ -122,6 +122,9 @@
   LayoutObject& cell1 = *getLayoutObjectByElementId("cell1");
   LayoutObject& cell2 = *getLayoutObjectByElementId("cell2");
   LayoutObject& row = *getLayoutObjectByElementId("row");
+  PaintLayer& htmlLayer =
+      *toLayoutBoxModelObject(document().documentElement()->layoutObject())
+           ->layer();
 
   rootPaintController().invalidateAll();
   document().view()->updateAllLifecyclePhasesExceptPaint();
@@ -130,12 +133,14 @@
   paint(&interestRect);
 
   EXPECT_DISPLAY_LIST(
-      rootPaintController().getDisplayItemList(), 5,
-      TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
+      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.
@@ -143,8 +148,10 @@
   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.
@@ -152,12 +159,14 @@
   paint(&interestRect);
 
   EXPECT_DISPLAY_LIST(
-      rootPaintController().getDisplayItemList(), 5,
-      TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
+      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) {