Reland of Paint collapsed borders of a table as one display item

third_party/WebKit/Source/core/paint/TableCellPainterTest.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"
 
 namespace blink {
 
 using TableCellPainterTest = PaintControllerPaintTest;
@@ skipping 152 matching lines @@
 }
 
 TEST_F(TableCellPainterTest, 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>"
-      "<table>"
+      "<table id='table'>"
       "  <tr><td id='cell'></td></tr>"
       "</table>");
 
   LayoutView& layoutView = *document().layoutView();
+  LayoutObject& table = *getLayoutObjectByElementId("table");
   LayoutObject& cell = *getLayoutObjectByElementId("cell");
 
   rootPaintController().invalidateAll();
   document().view()->updateAllLifecyclePhasesExceptPaint();
   // Intersects the overflowing part of cell but not border box.
   IntRect interestRect(0, 0, 100, 100);
   paint(&interestRect);
 
   // We should paint all display items of cell.
   EXPECT_DISPLAY_LIST(
       rootPaintController().getDisplayItemList(), 4,
       TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
       TestDisplayItem(cell, DisplayItem::kBoxDecorationBackground),
-      TestDisplayItem(cell, DisplayItem::kTableCollapsedBorderLast),
+      TestDisplayItem(table, DisplayItem::kTableCollapsedBorders),
       TestDisplayItem(cell, DisplayItem::paintPhaseToDrawingType(
                                 PaintPhaseSelfOutlineOnly)));
 }
 
 }  // namespace blink