| Index: third_party/WebKit/Source/core/paint/TableCellPainter.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/TableCellPainter.cpp b/third_party/WebKit/Source/core/paint/TableCellPainter.cpp
|
| index 6c14e2660979408fa04745cdcf64e4c062fea5bc..7fcfcbad8a8e91b32a93ef2b1c6222a630ac0563 100644
|
| --- a/third_party/WebKit/Source/core/paint/TableCellPainter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/TableCellPainter.cpp
|
| @@ -115,10 +115,10 @@ void TableCellPainter::paintCollapsedBorders(const PaintInfo& paintInfo, const L
|
| return;
|
|
|
| GraphicsContext& graphicsContext = paintInfo.context;
|
| - if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(graphicsContext, m_layoutTableCell, static_cast<DisplayItem::Type>(displayItemType), adjustedPaintOffset))
|
| + if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(graphicsContext, m_layoutTableCell, static_cast<DisplayItem::Type>(displayItemType)))
|
| return;
|
|
|
| - LayoutObjectDrawingRecorder recorder(graphicsContext, m_layoutTableCell, static_cast<DisplayItem::Type>(displayItemType), borderRect, adjustedPaintOffset);
|
| + LayoutObjectDrawingRecorder recorder(graphicsContext, m_layoutTableCell, static_cast<DisplayItem::Type>(displayItemType), borderRect);
|
| Color cellColor = m_layoutTableCell.resolveColor(CSSPropertyColor);
|
|
|
| // We never paint diagonals at the joins. We simply let the border with the highest
|
| @@ -159,7 +159,7 @@ void TableCellPainter::paintBackgroundsBehindCell(const PaintInfo& paintInfo, co
|
| Optional<LayoutObjectDrawingRecorder> recorder;
|
| if (backgroundObject != &m_layoutTableCell) {
|
| LayoutPoint adjustedPaintOffset = paintRect.location();
|
| - if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutTableCell, type, adjustedPaintOffset))
|
| + if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutTableCell, type))
|
| return;
|
| recorder.emplace(paintInfo.context, m_layoutTableCell, type, paintRect, adjustedPaintOffset);
|
| } else {
|
| @@ -192,13 +192,13 @@ void TableCellPainter::paintBoxDecorationBackground(const PaintInfo& paintInfo,
|
| if (!m_layoutTableCell.hasBackground() && !m_layoutTableCell.styleRef().boxShadow() && !needsToPaintBorder)
|
| return;
|
|
|
| - if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutTableCell, DisplayItem::BoxDecorationBackground, paintOffset))
|
| + if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutTableCell, DisplayItem::BoxDecorationBackground))
|
| return;
|
|
|
| LayoutRect visualOverflowRect = m_layoutTableCell.visualOverflowRect();
|
| visualOverflowRect.moveBy(paintOffset);
|
| // TODO(chrishtr): the pixel-snapping here is likely incorrect.
|
| - LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutTableCell, DisplayItem::BoxDecorationBackground, pixelSnappedIntRect(visualOverflowRect), paintOffset);
|
| + LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutTableCell, DisplayItem::BoxDecorationBackground, pixelSnappedIntRect(visualOverflowRect));
|
|
|
| LayoutRect paintRect = paintBounds(paintOffset, DoNotAddOffsetFromParent);
|
|
|
| @@ -224,11 +224,11 @@ void TableCellPainter::paintMask(const PaintInfo& paintInfo, const LayoutPoint&
|
| if (!tableElt->collapseBorders() && m_layoutTableCell.style()->emptyCells() == HIDE && !m_layoutTableCell.firstChild())
|
| return;
|
|
|
| - if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutTableCell, paintInfo.phase, paintOffset))
|
| + if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutTableCell, paintInfo.phase))
|
| return;
|
|
|
| LayoutRect paintRect = paintBounds(paintOffset, DoNotAddOffsetFromParent);
|
| - LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutTableCell, paintInfo.phase, paintRect, paintOffset);
|
| + LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutTableCell, paintInfo.phase, paintRect);
|
| BoxPainter(m_layoutTableCell).paintMaskImages(paintInfo, paintRect);
|
| }
|
|
|
|
|