Let collapsed border drawings be cacheable

Previously because one table cell may paint its collapsed borders
multiple times, we enclose all collapsed border drawings in a
ScopeRecorder.

However, actually a table cell paints each border only once. When it
paint collapsed borders multiple times, it just paint different borders
in different time.

Use display item type to distinguish the different borders to avoid
the ScopeRecorder.

Also revert https://codereview.chromium.org/1234463005 to invalidate
table cells with changed collapsed borders.

BUG=510492

Review URL: https://codereview.chromium.org/1306433002

git-svn-id: svn://svn.chromium.org/blink/trunk@201002 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/TestExpectations

@@ -451,6 +451,10 @@ crbug.com/318978 [ Linux ] http/tests/security/frameNavigation/xss-DENIED-plugin
 crbug.com/318978 [ Linux ] permissionclient/plugin-permission.html [ Skip ]
 crbug.com/318978 [ Linux ] plugins/ [ Skip ]
 
+crbug.com/510492 fast/repaint/table-cell-collapsed-border.html [ NeedsRebaseline ]
+crbug.com/510492 fast/repaint/table-collapsed-border.html [ NeedsRebaseline ]
+crbug.com/510492 fast/table/border-collapsing/cached-change-cell-sl-border-color.html [ NeedsRebaseline ]
+
 crbug.com/380217 [ Linux Win ] fast/shapes/shape-outside-floats/shape-outside-floats-inset-rounded-large-radius.html [ Skip ]
 crbug.com/380217 [ Win ] fast/shapes/shape-outside-floats/shape-outside-floats-inset-rounded-bottom-left.html [ Skip ]
 

third_party/WebKit/LayoutTests/fast/repaint/table-outer-border-expected.txt

@@ -26,6 +26,8 @@
         "LayoutTableRow TR",
         "LayoutTableSection TBODY",
         "LayoutTable TABLE id='table'",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTable TABLE id='table' class='green'",
         "LayoutTableCell TD",
         "LayoutTableCell TD",

third_party/WebKit/LayoutTests/fast/table/border-collapsing/border-collapse-change-separate-to-collapse-expected.txt

@@ -18,6 +18,8 @@
         [8, 8, 107, 108]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTable TABLE id='table'",
         "LayoutTableCell TD",
         "LayoutTableCell TD",

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-cell-append-expected.txt

@@ -11,6 +11,8 @@
         [63, 8, 60, 54]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTable TABLE",
         "LayoutTableCell TD"
       ]

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-cell-remove-expected.txt

@@ -18,6 +18,8 @@
       ],
       "paintInvalidationClients": [
         "LayoutTableCell TD id='bar'",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTable TABLE",
         "LayoutTableCell TD",
         "LayoutTableCell TD",

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-change-cell-border-color-expected.txt

@@ -9,6 +9,8 @@
         [8, 8, 60, 54]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD id='foo'",
+        "LayoutTableCell TD",
         "LayoutTableCell TD id='foo'"
       ]
     }

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-change-cell-border-width-expected.txt

@@ -20,6 +20,8 @@
         [8, 8, 55, 52]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD id='foo'",
+        "LayoutTableCell TD",
         "LayoutTable TABLE",
         "LayoutTableSection TBODY",
         "LayoutTableRow TR",

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-change-col-border-color-expected.txt

@@ -9,6 +9,10 @@
         [8, 8, 113, 104]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTableCell TD",
         "LayoutTableCell TD",
         "LayoutTableCol COL id='col'"

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-change-col-border-width-expected.txt

@@ -28,6 +28,10 @@
         [8, 8, 56, 52]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTable TABLE",
         "LayoutTableCell TD",
         "LayoutTableCell TD",

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-change-colgroup-border-color-expected.txt

@@ -9,6 +9,12 @@
         [8, 8, 166, 102]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTableCell TD",
         "LayoutTableCell TD",
         "LayoutTableCell TD",

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-change-colgroup-border-width-expected.txt

@@ -17,6 +17,12 @@
         [7, 7, 56, 53]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTableCell TD",
         "LayoutTableCell TD",
         "LayoutTableCell TD",

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-change-row-border-color-expected.txt

@@ -9,6 +9,8 @@
         [10, 10, 56, 50]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTableCell TD",
         "LayoutTableRow TR id='row'"
       ]

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-change-row-border-width-expected.txt

@@ -20,6 +20,8 @@
         [8, 8, 56, 52]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTable TABLE",
         "LayoutTableCell TD",
         "LayoutTableSection TBODY",

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-change-table-border-color-expected.txt

@@ -9,6 +9,7 @@
         [8, 8, 60, 54]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD",
         "LayoutTable TABLE id='tbl'"
       ]
     }

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-change-table-border-width-expected.txt

@@ -16,6 +16,7 @@
         [8, 8, 56, 52]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD",
         "LayoutTable TABLE id='tbl'",
         "LayoutTableSection TBODY",
         "LayoutTableRow TR",

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-change-tbody-border-color-expected.txt

@@ -9,6 +9,12 @@
         [10, 10, 110, 100]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTableCell TD",
         "LayoutTableCell TD",
         "LayoutTableCell TD",

third_party/WebKit/LayoutTests/fast/table/border-collapsing/cached-change-tbody-border-width-expected.txt

@@ -34,6 +34,12 @@
         [8, 8, 56, 52]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTable TABLE",
         "LayoutTableCell TD",
         "LayoutTableCell TD",

third_party/WebKit/LayoutTests/platform/linux/fast/repaint/table-cell-collapsed-border-expected.txt

@@ -11,6 +11,17 @@
         [3, 264, 118, 110]
       ],
       "paintInvalidationClients": [
+        "LayoutTableCell TD",
+        "LayoutTableCell TD id='t1'",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD id='t2'",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD id='t3'",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTableCell TD id='t1'",
         "LayoutTableCell TD id='t2'",
         "LayoutTableCell TD id='t3'"

third_party/WebKit/LayoutTests/platform/linux/fast/repaint/table-collapsed-border-expected.txt

@@ -50,7 +50,14 @@
         "InlineTextBox 'sit amet'",
         "RootInlineBox",
         "InlineTextBox 'ipsum dolor'",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTable TABLE id='t'",
+        "LayoutTableCell TD",
         "LayoutTable TABLE",
         "LayoutTableCell TD",
         "LayoutTableCell TD",
@@ -60,6 +67,7 @@
         "LayoutTableSection TBODY",
         "LayoutTableCell TD",
         "LayoutTableCell TD",
+        "LayoutTableCell TD",
         "LayoutTable TABLE",
         "LayoutTableCell TD",
         "LayoutTableCell TD",

third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/cached-change-cell-sl-border-color-expected.txt

@@ -13,6 +13,8 @@
         "InlineTextBox 'A'",
         "LayoutText #text",
         "RootInlineBox",
+        "LayoutTableCell TD id='foo'",
+        "LayoutTableCell TD",
         "LayoutTableCell TD id='foo'"
       ]
     }

third_party/WebKit/Source/core/layout/LayoutTableCell.cpp

@@ -951,10 +951,15 @@ void LayoutTableCell::collectBorderValues(LayoutTable::CollapsedBorderValues& bo
     CollapsedBorderValue beforeBorder = computeCollapsedBeforeBorder();
     CollapsedBorderValue afterBorder = computeCollapsedAfterBorder();
     LayoutTableSection* section = this->section();
-    section->setCachedCollapsedBorder(this, CBSStart, startBorder);
-    section->setCachedCollapsedBorder(this, CBSEnd, endBorder);
-    section->setCachedCollapsedBorder(this, CBSBefore, beforeBorder);
-    section->setCachedCollapsedBorder(this, CBSAfter, afterBorder);
+    bool changed = section->setCachedCollapsedBorder(this, CBSStart, startBorder);
+    changed |= section->setCachedCollapsedBorder(this, CBSEnd, endBorder);
+    changed |= section->setCachedCollapsedBorder(this, CBSBefore, beforeBorder);
+    changed |= section->setCachedCollapsedBorder(this, CBSAfter, afterBorder);
+
+    // In slimming paint mode, we need to invalidate all cells with collapsed border changed.
+    // FIXME: Need a way to invalidate/repaint the borders only. crbug.com/451090#c5.
+    if (changed && RuntimeEnabledFeatures::slimmingPaintEnabled())
+        invalidateDisplayItemClient(*this);
 
     addBorderStyle(borderValues, startBorder);
     addBorderStyle(borderValues, endBorder);

third_party/WebKit/Source/core/layout/LayoutTableSection.cpp

@@ -1602,14 +1602,19 @@ void LayoutTableSection::removeCachedCollapsedBorders(const LayoutTableCell* cel
         m_cellsCollapsedBorders.remove(std::make_pair(cell, side));
 }
 
-void LayoutTableSection::setCachedCollapsedBorder(const LayoutTableCell* cell, CollapsedBorderSide side, const CollapsedBorderValue& border)
+bool LayoutTableSection::setCachedCollapsedBorder(const LayoutTableCell* cell, CollapsedBorderSide side, const CollapsedBorderValue& border)
 {
     ASSERT(table()->collapseBorders());
     CellsCollapsedBordersMap::iterator it = m_cellsCollapsedBorders.find(std::make_pair(cell, side));
-    if (it == m_cellsCollapsedBorders.end())
+    if (it == m_cellsCollapsedBorders.end()) {
         m_cellsCollapsedBorders.add(std::make_pair(cell, side), border);
-    else
+        return true;
+    }
+    if (!it->value.equals(border)) {
         it->value = border;
+        return true;
+    }
+    return false;
 }
 
 const CollapsedBorderValue& LayoutTableSection::cachedCollapsedBorder(const LayoutTableCell* cell, CollapsedBorderSide side) const

third_party/WebKit/Source/core/layout/LayoutTableSection.h

@@ -210,7 +210,8 @@ public:
     void rowLogicalHeightChanged(LayoutTableRow*);
 
     void removeCachedCollapsedBorders(const LayoutTableCell*);
-    void setCachedCollapsedBorder(const LayoutTableCell*, CollapsedBorderSide, const CollapsedBorderValue&);
+    // Returns true if any collapsed borders of the cell changed.
+    bool setCachedCollapsedBorder(const LayoutTableCell*, CollapsedBorderSide, const CollapsedBorderValue&);
     const CollapsedBorderValue& cachedCollapsedBorder(const LayoutTableCell*, CollapsedBorderSide) const;
 
     // distributeExtraLogicalHeightToRows methods return the *consumed* extra logical height.

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

@@ -83,12 +83,17 @@ void TableCellPainter::paintCollapsedBorders(const PaintInfo& paintInfo, const L
     const CollapsedBorderValue& topBorderValue = cachedCollapsedTopBorder(styleForCellFlow);
     const CollapsedBorderValue& bottomBorderValue = cachedCollapsedBottomBorder(styleForCellFlow);
 
-    bool shouldPaintTop = topBorderValue.shouldPaint(*tableCurrentBorderValue);
-    bool shouldPaintBottom = bottomBorderValue.shouldPaint(*tableCurrentBorderValue);
-    bool shouldPaintLeft = leftBorderValue.shouldPaint(*tableCurrentBorderValue);
-    bool shouldPaintRight = rightBorderValue.shouldPaint(*tableCurrentBorderValue);
+    int displayItemType = DisplayItem::TableCollapsedBorderBase;
+    if (topBorderValue.shouldPaint(*tableCurrentBorderValue))
+        displayItemType |= DisplayItem::TableCollapsedBorderTop;
+    if (bottomBorderValue.shouldPaint(*tableCurrentBorderValue))
+        displayItemType |= DisplayItem::TableCollapsedBorderBottom;
+    if (leftBorderValue.shouldPaint(*tableCurrentBorderValue))
+        displayItemType |= DisplayItem::TableCollapsedBorderLeft;
+    if (rightBorderValue.shouldPaint(*tableCurrentBorderValue))
+        displayItemType |= DisplayItem::TableCollapsedBorderRight;
 
-    if (!shouldPaintTop && !shouldPaintBottom && !shouldPaintLeft && !shouldPaintRight)
+    if (displayItemType == DisplayItem::TableCollapsedBorderBase)
         return;
 
     // Adjust our x/y/width/height so that we paint the collapsed borders at the correct location.
@@ -107,28 +112,28 @@ void TableCellPainter::paintCollapsedBorders(const PaintInfo& paintInfo, const L
         return;
 
     GraphicsContext* graphicsContext = paintInfo.context;
-    if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*graphicsContext, m_layoutTableCell, paintInfo.phase))
+    if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*graphicsContext, m_layoutTableCell, static_cast<DisplayItem::Type>(displayItemType)))
         return;
 
-    LayoutObjectDrawingRecorder recorder(*graphicsContext, m_layoutTableCell, paintInfo.phase, borderRect);
+    LayoutObjectDrawingRecorder recorder(*graphicsContext, m_layoutTableCell, static_cast<DisplayItem::Type>(displayItemType), borderRect);
     Color cellColor = m_layoutTableCell.resolveColor(CSSPropertyColor);
     bool antialias = BoxPainter::shouldAntialiasLines(graphicsContext);
 
     // We never paint diagonals at the joins.  We simply let the border with the highest
     // precedence paint on top of borders with lower precedence.
-    if (shouldPaintTop) {
+    if (displayItemType & DisplayItem::TableCollapsedBorderTop) {
         ObjectPainter::drawLineForBoxSide(graphicsContext, borderRect.x(), borderRect.y(), borderRect.maxX(), borderRect.y() + topWidth, BSTop,
             topBorderValue.color().resolve(cellColor), collapsedBorderStyle(topBorderValue.style()), 0, 0, antialias);
     }
-    if (shouldPaintBottom) {
+    if (displayItemType & DisplayItem::TableCollapsedBorderBottom) {
         ObjectPainter::drawLineForBoxSide(graphicsContext, borderRect.x(), borderRect.maxY() - bottomWidth, borderRect.maxX(), borderRect.maxY(), BSBottom,
             bottomBorderValue.color().resolve(cellColor), collapsedBorderStyle(bottomBorderValue.style()), 0, 0, antialias);
     }
-    if (shouldPaintLeft) {
+    if (displayItemType & DisplayItem::TableCollapsedBorderLeft) {
         ObjectPainter::drawLineForBoxSide(graphicsContext, borderRect.x(), borderRect.y(), borderRect.x() + leftWidth, borderRect.maxY(), BSLeft,
             leftBorderValue.color().resolve(cellColor), collapsedBorderStyle(leftBorderValue.style()), 0, 0, antialias);
     }
-    if (shouldPaintRight) {
+    if (displayItemType & DisplayItem::TableCollapsedBorderRight) {
         ObjectPainter::drawLineForBoxSide(graphicsContext, borderRect.maxX() - rightWidth, borderRect.y(), borderRect.maxX(), borderRect.maxY(), BSRight,
             rightBorderValue.color().resolve(cellColor), collapsedBorderStyle(rightBorderValue.style()), 0, 0, antialias);
     }

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

@@ -54,7 +54,6 @@ void TablePainter::paintObject(const PaintInfo& paintInfo, const LayoutPoint& pa
         LayoutTable::CollapsedBorderValues collapsedBorders = m_layoutTable.collapsedBorders();
         size_t count = collapsedBorders.size();
         for (size_t i = 0; i < count; ++i) {
-            ScopeRecorder scopeRecorder(*info.context);
             // FIXME: pass this value into children rather than storing temporarily on the LayoutTable object.
             m_layoutTable.setCurrentBorderValue(&collapsedBorders[i]);
             for (LayoutTableSection* section = m_layoutTable.bottomSection(); section; section = m_layoutTable.sectionAbove(section)) {

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

@@ -53,6 +53,23 @@ static WTF::String paintPhaseAsDebugString(int paintPhase)
 
 static WTF::String specialDrawingTypeAsDebugString(DisplayItem::Type type)
 {
+    if (type >= DisplayItem::TableCollapsedBorderUnalignedBase) {
+        if (type <= DisplayItem::TableCollapsedBorderBase)
+            return "TableCollapsedBorderAlignment";
+        if (type <= DisplayItem::TableCollapsedBorderLast) {
+            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);

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

@@ -91,6 +91,12 @@ public:
         SelectionGap,
         SelectionTint,
         TableCellBackgroundFromSelfPaintingRow, // FIXME: To be deprecated.
+        // Table collapsed borders can be painted together (e.g., left & top) but there are at most 4 phases of collapsed
+        // border painting for a single cell. To disambiguate these phases of collapsed border painting, a mask is used.
+        // TableCollapsedBorderBase can be larger than TableCollapsedBorderUnalignedBase to ensure the base lower bits are 0's.
+        TableCollapsedBorderUnalignedBase,
+        TableCollapsedBorderBase = (((TableCollapsedBorderUnalignedBase - 1) >> 4) + 1) << 4,
+        TableCollapsedBorderLast = TableCollapsedBorderBase + 0x0f,
         VideoBitmap,
         WebPlugin,
         WebFont,
@@ -178,6 +184,16 @@ public:
         TypeLast = UninitializedType
     };
 
+    static_assert(TableCollapsedBorderBase >= TableCollapsedBorderUnalignedBase, "TableCollapsedBorder types overlap with other types");
+    static_assert((TableCollapsedBorderBase & 0xf) == 0, "The lowest 4 bits of TableCollapsedBorderBase should be zero");
+    // Bits or'ed onto TableCollapsedBorderBase to generate a real table collapsed border type.
+    enum TableCollspaedBorderSides {
+        TableCollapsedBorderTop = 1 << 0,
+        TableCollapsedBorderRight = 1 << 1,
+        TableCollapsedBorderBottom = 1 << 2,
+        TableCollapsedBorderLeft = 1 << 3,
+    };
+
     DisplayItem(const DisplayItemClientWrapper& client, Type type, size_t derivedSize)
         : m_client(client.displayItemClient())
         , m_scope(0)
@@ -219,19 +235,19 @@ public:
     };
 
     // Convert cached type to non-cached type (e.g., Type::CachedSVGImage -> Type::SVGImage).
-    Type nonCachedType() const
+    static Type nonCachedType(Type type)
     {
-        if (isCachedDrawingType(m_type))
-            return cachedDrawingTypeToDrawingType(m_type);
-        if (isCachedSubtreeType(m_type))
-            return cachedSubtreeTypeToBeginSubtreeType(m_type);
-        return m_type;
+        if (isCachedDrawingType(type))
+            return cachedDrawingTypeToDrawingType(type);
+        if (isCachedSubtreeType(type))
+            return cachedSubtreeTypeToBeginSubtreeType(type);
+        return type;
     }
 
     // Return the Id with cached type converted to non-cached type.
     Id nonCachedId() const
     {
-        return Id(m_client, nonCachedType(), m_scope);
+        return Id(m_client, nonCachedType(m_type), m_scope);
     }
 
     virtual void replay(GraphicsContext&) { }