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 06c10abee1a4ba826fc7820f941ab377bbddd02e..bdb84d189989b849f53c6ff8c1469d9c8ab91974 100644 |
--- a/third_party/WebKit/Source/core/paint/TableCellPainter.cpp |
+++ b/third_party/WebKit/Source/core/paint/TableCellPainter.cpp |
@@ -71,7 +71,7 @@ static EBorderStyle collapsedBorderStyle(EBorderStyle style) { |
const DisplayItemClient& TableCellPainter::displayItemClientForBorders() const { |
// TODO(wkorman): We may need to handle PaintInvalidationDelayedFull. |
// http://crbug.com/657186 |
- return m_layoutTableCell.usesTableAsAdditionalDisplayItemClient() |
+ return m_layoutTableCell.usesCompositedCellDisplayItemClients() |
? static_cast<const DisplayItemClient&>( |
*m_layoutTableCell.collapsedBorderValues()) |
: m_layoutTableCell; |
@@ -195,14 +195,16 @@ void TableCellPainter::paintContainerBackgroundBehindCell( |
!m_layoutTableCell.firstChild()) |
return; |
- if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible( |
- paintInfo.context, m_layoutTableCell, type)) |
+ const DisplayItemClient& client = |
+ m_layoutTableCell.backgroundDisplayItemClient(); |
+ if (DrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, client, |
+ type)) |
return; |
LayoutRect paintRect = |
paintRectNotIncludingVisualOverflow(adjustedPaintOffset); |
- LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutTableCell, |
- type, paintRect); |
+ DrawingRecorder recorder(paintInfo.context, client, type, |
+ FloatRect(paintRect)); |
paintBackground(paintInfo, paintRect, backgroundObject); |
} |