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

third_party/WebKit/Source/platform/graphics/paint/DisplayItem.cpp

 // Copyright 2014 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 "platform/graphics/paint/DisplayItem.h"
 
 namespace blink {
 
 struct SameSizeAsDisplayItem {
   virtual ~SameSizeAsDisplayItem() {}  // Allocate vtable pointer.
@@ skipping 50 matching lines @@
 #define DEBUG_STRING_CASE(DisplayItemName) \
   case DisplayItem::k##DisplayItemName:    \
     return #DisplayItemName
 
 #define DEFAULT_CASE      \
   default:                \
     ASSERT_NOT_REACHED(); \
     return "Unknown"
 
 static WTF::String specialDrawingTypeAsDebugString(DisplayItem::Type type) {
-  if (type >= DisplayItem::kTableCollapsedBorderUnalignedBase) {
-    if (type <= DisplayItem::kTableCollapsedBorderBase)
-      return "TableCollapsedBorderAlignment";
-    if (type <= DisplayItem::kTableCollapsedBorderLast) {
-      StringBuilder sb;
-      sb.append("TableCollapsedBorder");
-      if (type & DisplayItem::TableCollapsedBorderTop)
-        sb.append("Top");
-      if (type & DisplayItem::TableCollapsedBorderRight)
-        sb.append("Right");
-      if (type & DisplayItem::TableCollapsedBorderBottom)
-        sb.append("Bottom");
-      if (type & DisplayItem::TableCollapsedBorderLeft)
-        sb.append("Left");
-      return sb.toString();
-    }
-  }
   switch (type) {
     DEBUG_STRING_CASE(BoxDecorationBackground);
     DEBUG_STRING_CASE(Caret);
     DEBUG_STRING_CASE(ColumnRules);
     DEBUG_STRING_CASE(DebugDrawing);
     DEBUG_STRING_CASE(DocumentBackground);
     DEBUG_STRING_CASE(DragImage);
     DEBUG_STRING_CASE(DragCaret);
     DEBUG_STRING_CASE(SVGImage);
     DEBUG_STRING_CASE(LinkHighlight);
@@ skipping 21 matching lines @@
     DEBUG_STRING_CASE(ScrollbarForwardTrack);
     DEBUG_STRING_CASE(ScrollbarThumb);
     DEBUG_STRING_CASE(ScrollbarTickmarks);
     DEBUG_STRING_CASE(ScrollbarTrackBackground);
     DEBUG_STRING_CASE(ScrollbarCompositedScrollbar);
     DEBUG_STRING_CASE(SelectionTint);
     DEBUG_STRING_CASE(TableCellBackgroundFromColumnGroup);
     DEBUG_STRING_CASE(TableCellBackgroundFromColumn);
     DEBUG_STRING_CASE(TableCellBackgroundFromSection);
     DEBUG_STRING_CASE(TableCellBackgroundFromRow);
+    DEBUG_STRING_CASE(TableCollapsedBorders);
     DEBUG_STRING_CASE(TableSectionBoxShadowInset);
     DEBUG_STRING_CASE(TableSectionBoxShadowNormal);
     DEBUG_STRING_CASE(TableRowBoxShadowInset);
     DEBUG_STRING_CASE(TableRowBoxShadowNormal);
     DEBUG_STRING_CASE(VideoBitmap);
     DEBUG_STRING_CASE(WebPlugin);
     DEBUG_STRING_CASE(WebFont);
     DEBUG_STRING_CASE(ReflectionMask);
 
     DEFAULT_CASE;
@@ skipping 122 matching lines @@
   stringBuilder.append("\", type: \"");
   stringBuilder.append(typeAsDebugString(getType()));
   stringBuilder.append('"');
   if (m_skippedCache)
     stringBuilder.append(", skippedCache: true");
 }
 
 #endif
 
 }  // namespace blink