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

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

Index: third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp b/third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp
index 085cf1aacff08ba356f0ba6c68b87bc6b6187007..e8641069f2c89fa94b3ef57ef4c2ad4b8eeb6f42 100644
--- a/third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp
+++ b/third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp
@@ -115,9 +115,6 @@ TEST_F(TableCellPainterTest, BackgroundInSelfPaintingRow) {
   LayoutObject& cell1 = *getLayoutObjectByElementId("cell1");
   LayoutObject& cell2 = *getLayoutObjectByElementId("cell2");
   LayoutObject& row = *getLayoutObjectByElementId("row");
-  PaintLayer& htmlLayer =
-      *toLayoutBoxModelObject(document().documentElement()->layoutObject())
-           ->layer();
 
   rootPaintController().invalidateAll();
   document().view()->updateAllLifecyclePhasesExceptPaint();
@@ -126,14 +123,12 @@ TEST_F(TableCellPainterTest, BackgroundInSelfPaintingRow) {
   paint(&interestRect);
 
   EXPECT_DISPLAY_LIST(
-      rootPaintController().getDisplayItemList(), 7,
+      rootPaintController().getDisplayItemList(), 5,
       TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
-      TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
       TestDisplayItem(row, DisplayItem::kBeginCompositing),
       TestDisplayItem(cell1, DisplayItem::kTableCellBackgroundFromRow),
       TestDisplayItem(cell1, DisplayItem::kBoxDecorationBackground),
-      TestDisplayItem(row, DisplayItem::kEndCompositing),
-      TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+      TestDisplayItem(row, DisplayItem::kEndCompositing));
 
   document().view()->updateAllLifecyclePhasesExceptPaint();
   // Intersects the spacing only.
@@ -141,10 +136,8 @@ TEST_F(TableCellPainterTest, BackgroundInSelfPaintingRow) {
   paint(&interestRect);
 
   EXPECT_DISPLAY_LIST(
-      rootPaintController().getDisplayItemList(), 3,
-      TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
-      TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-      TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+      rootPaintController().getDisplayItemList(), 1,
+      TestDisplayItem(layoutView, DisplayItem::kDocumentBackground));
 
   document().view()->updateAllLifecyclePhasesExceptPaint();
   // Intersects cell2 only.
@@ -152,14 +145,12 @@ TEST_F(TableCellPainterTest, BackgroundInSelfPaintingRow) {
   paint(&interestRect);
 
   EXPECT_DISPLAY_LIST(
-      rootPaintController().getDisplayItemList(), 7,
+      rootPaintController().getDisplayItemList(), 5,
       TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
-      TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
       TestDisplayItem(row, DisplayItem::kBeginCompositing),
       TestDisplayItem(cell2, DisplayItem::kTableCellBackgroundFromRow),
       TestDisplayItem(cell2, DisplayItem::kBoxDecorationBackground),
-      TestDisplayItem(row, DisplayItem::kEndCompositing),
-      TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+      TestDisplayItem(row, DisplayItem::kEndCompositing));
 }
 
 TEST_F(TableCellPainterTest, CollapsedBorderAndOverflow) {