Fix table background painting

third_party/WebKit/Source/core/paint/TableSectionPainter.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 "core/paint/TableSectionPainter.h"
 
 #include "core/layout/LayoutTable.h"
 #include "core/layout/LayoutTableCell.h"
 #include "core/layout/LayoutTableCol.h"
 #include "core/layout/LayoutTableRow.h"
 #include "core/paint/BlockPainter.h"
 #include "core/paint/BoxClipper.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/ObjectPainter.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/TableCellPainter.h"
+#include "core/paint/TableCollapsedBorderPainter.h"
 #include "core/paint/TableRowPainter.h"
 #include <algorithm>
 
 namespace blink {
 
 void TableSectionPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     ASSERT(!m_layoutTableSection.needsLayout());
     // avoid crashing on bugs that cause us to paint with dirty layout
     if (m_layoutTableSection.needsLayout())
@@ skipping 45 matching lines @@
     localPaintInvalidationRect.moveBy(-adjustedPaintOffset);
 
     LayoutRect tableAlignedRect = m_layoutTableSection.logicalRectForWritingModeAndDirection(localPaintInvalidationRect);
 
     CellSpan dirtiedRows = m_layoutTableSection.dirtiedRows(tableAlignedRect);
     CellSpan dirtiedColumns = m_layoutTableSection.dirtiedEffectiveColumns(tableAlignedRect);
 
     if (dirtiedColumns.start() >= dirtiedColumns.end())
         return;
 
+
     // Collapsed borders are painted from the bottom right to the top left so that precedence
     // due to cell position is respected.
     for (unsigned r = dirtiedRows.end(); r > dirtiedRows.start(); r--) {
         unsigned row = r - 1;
         for (unsigned c = dirtiedColumns.end(); c > dirtiedColumns.start(); c--) {
             unsigned col = c - 1;
             const LayoutTableSection::CellStruct& current = m_layoutTableSection.cellAt(row, col);
             const LayoutTableCell* cell = current.primaryCell();
             if (!cell || (row > dirtiedRows.start() && m_layoutTableSection.primaryCellAt(row - 1, col) == cell) || (col > dirtiedColumns.start() && m_layoutTableSection.primaryCellAt(row, col - 1) == cell))
                 continue;
             LayoutPoint cellPoint = m_layoutTableSection.flipForWritingModeForChild(cell, adjustedPaintOffset);
             TableCellPainter(*cell).paintCollapsedBorders(paintInfo, cellPoint, currentBorderValue);
         }
     }
 }
 
+void TableSectionPainter::paintCollapsedBorders2(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, TableCollapsedBorderPainter& previousPainter)
+{
+    if (!m_layoutTableSection.numRows() || !m_layoutTableSection.table()->effectiveColumns().size())
+        return;
+
+    LayoutPoint adjustedPaintOffset = paintOffset + m_layoutTableSection.location();
+    BoxClipper boxClipper(m_layoutTableSection, paintInfo, adjustedPaintOffset, ForceContentsClip);
+
+    LayoutRect localPaintInvalidationRect = LayoutRect(paintInfo.cullRect().m_rect);
+    localPaintInvalidationRect.moveBy(-adjustedPaintOffset);
+
+    LayoutRect tableAlignedRect = m_layoutTableSection.logicalRectForWritingModeAndDirection(localPaintInvalidationRect);
+
+    CellSpan dirtiedRows = m_layoutTableSection.dirtiedRows(tableAlignedRect);
+    CellSpan dirtiedEffColumns = m_layoutTableSection.dirtiedEffectiveColumns(tableAlignedRect);
+
+    TableCollapsedBorderPainter painter(&m_layoutTableSection);
+    painter.paintBorders(paintInfo, paintOffset, dirtiedRows, dirtiedEffColumns, previousPainter);
+    previousPainter = painter;
+    return;
+}
+
 void TableSectionPainter::paintObject(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     LayoutRect localPaintInvalidationRect = LayoutRect(paintInfo.cullRect().m_rect);
     localPaintInvalidationRect.moveBy(-paintOffset);
 
     LayoutRect tableAlignedRect = m_layoutTableSection.logicalRectForWritingModeAndDirection(localPaintInvalidationRect);
 
     CellSpan dirtiedRows = m_layoutTableSection.dirtiedRows(tableAlignedRect);
     CellSpan dirtiedColumns = m_layoutTableSection.dirtiedEffectiveColumns(tableAlignedRect);
 
@@ skipping 102 matching lines @@
         // painting the row background for the cell.
         if (row->hasBackground() && !row->hasSelfPaintingLayer())
             TableCellPainter(cell).paintBackgroundsBehindCell(paintInfoForCells, cellPoint, row, DisplayItem::TableCellBackgroundFromRow);
     }
 
     if (originalPaintPhase != PaintPhaseSelfBlockBackgroundOnly && !cell.hasSelfPaintingLayer() && !row->hasSelfPaintingLayer())
         cell.paint(paintInfoForCells, cellPoint);
 }
 
 } // namespace blink