Use table as display item client for painting composited collapsed table cell borders.

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

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 ec772402c33a84df07a352337fdd93e55a06a8e5..737c388cf4c5fe180728e07a0e62fdae7e2818cc 100644
--- a/third_party/WebKit/Source/core/paint/TableCellPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/TableCellPainter.cpp
@@ -11,45 +11,49 @@
 #include "core/paint/ObjectPainter.h"
 #include "core/paint/PaintInfo.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
+#include "platform/graphics/paint/DisplayItemCacheSkipper.h"
+#include "platform/graphics/paint/DrawingRecorder.h"
 
 namespace blink {
 
 static const CollapsedBorderValue& collapsedLeftBorder(
     const ComputedStyle& styleForCellFlow,
     const LayoutTableCell::CollapsedBorderValues& values) {
-  if (styleForCellFlow.isHorizontalWritingMode())
-    return styleForCellFlow.isLeftToRightDirection() ? values.startBorder
-                                                     : values.endBorder;
-  return styleForCellFlow.isFlippedBlocksWritingMode() ? values.afterBorder
-                                                       : values.beforeBorder;
+  if (styleForCellFlow.isHorizontalWritingMode()) {
+    return styleForCellFlow.isLeftToRightDirection() ? values.startBorder()
+                                                     : values.endBorder();
+  }
+  return styleForCellFlow.isFlippedBlocksWritingMode() ? values.afterBorder()
+                                                       : values.beforeBorder();
 }
 
 static const CollapsedBorderValue& collapsedRightBorder(
     const ComputedStyle& styleForCellFlow,
     const LayoutTableCell::CollapsedBorderValues& values) {
-  if (styleForCellFlow.isHorizontalWritingMode())
-    return styleForCellFlow.isLeftToRightDirection() ? values.endBorder
-                                                     : values.startBorder;
-  return styleForCellFlow.isFlippedBlocksWritingMode() ? values.beforeBorder
-                                                       : values.afterBorder;
+  if (styleForCellFlow.isHorizontalWritingMode()) {
+    return styleForCellFlow.isLeftToRightDirection() ? values.endBorder()
+                                                     : values.startBorder();
+  }
+  return styleForCellFlow.isFlippedBlocksWritingMode() ? values.beforeBorder()
+                                                       : values.afterBorder();
 }
 
 static const CollapsedBorderValue& collapsedTopBorder(
     const ComputedStyle& styleForCellFlow,
     const LayoutTableCell::CollapsedBorderValues& values) {
   if (styleForCellFlow.isHorizontalWritingMode())
-    return values.beforeBorder;
-  return styleForCellFlow.isLeftToRightDirection() ? values.startBorder
-                                                   : values.endBorder;
+    return values.beforeBorder();
+  return styleForCellFlow.isLeftToRightDirection() ? values.startBorder()
+                                                   : values.endBorder();
 }
 
 static const CollapsedBorderValue& collapsedBottomBorder(
     const ComputedStyle& styleForCellFlow,
     const LayoutTableCell::CollapsedBorderValues& values) {
   if (styleForCellFlow.isHorizontalWritingMode())
-    return values.afterBorder;
-  return styleForCellFlow.isLeftToRightDirection() ? values.endBorder
-                                                   : values.startBorder;
+    return values.afterBorder();
+  return styleForCellFlow.isLeftToRightDirection() ? values.endBorder()
+                                                   : values.startBorder();
 }
 
 void TableCellPainter::paint(const PaintInfo& paintInfo,
@@ -65,6 +69,16 @@ static EBorderStyle collapsedBorderStyle(EBorderStyle style) {
   return style;
 }
 
+const DisplayItemClient& TableCellPainter::displayItemClient() const {

[chrishtr, 2016/10/19 01:13:21]

The collapsed border values should only be used as DisplayItemClient for
DisplayItems used to paint collapsed borders. Perhaps your CL already does
that, but this name doesn't clearly indicate it.

[wkorman, 2016/10/19 23:07:39]

Done.

+  // TODO(wkorman): We may need to handle PaintInvalidationDelayedFull at all
+  // callsites in this file that make use of
+  // this client. http://crbug.com/657186
+  return m_layoutTableCell.usesTableAsDisplayItemClient()
+             ? static_cast<const DisplayItemClient&>(
+                   *m_layoutTableCell.collapsedBorderValues())
+             : m_layoutTableCell;
+}
+
 void TableCellPainter::paintCollapsedBorders(
     const PaintInfo& paintInfo,
     const LayoutPoint& paintOffset,
@@ -119,14 +133,15 @@ void TableCellPainter::paintCollapsedBorders(
       paintRect.height() + topWidth / 2 + (bottomWidth + 1) / 2);
 
   GraphicsContext& graphicsContext = paintInfo.context;
-  if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(
-          graphicsContext, m_layoutTableCell,
+  const DisplayItemClient& client = displayItemClient();
+  if (DrawingRecorder::useCachedDrawingIfPossible(
+          graphicsContext, client,
           static_cast<DisplayItem::Type>(displayItemType)))
     return;
 
-  LayoutObjectDrawingRecorder recorder(
-      graphicsContext, m_layoutTableCell,
-      static_cast<DisplayItem::Type>(displayItemType), borderRect);
+  DrawingRecorder recorder(graphicsContext, client,
+                           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
@@ -182,6 +197,8 @@ void TableCellPainter::paintContainerBackgroundBehindCell(
       !m_layoutTableCell.firstChild())
     return;
 
+  // TODO(wkorman): Investigate using displayItemClient() below. Currently
+  // attempting breaks caching for some reason.

[wkorman, 2016/10/19 00:52:43]

Thoughts on why attempting to use displayItemClient() produces caching exception
as below when opening composited-background test case (am adding that test to
bug as 'git cl upload' is currently down http://crbug.com/657216) and hovering
over second row?

current display item list: [{index: 0, validClient: false, originalDebugString:
{client: "0x3d4051204018 LayoutView #document", type:
"DrawingDocumentBackground", rect: [0.000000,0.000000 800.000000x600.000000]},
visualRect: [0,0 800x600]},
{index: 1, client: "0x3d4051214108 LayoutBlockFlow HTML", type: "Subsequence",
cacheIsValid: false, visualRect: [0,0 800x151]},
{index: 2, validClient: false, originalDebugString: {client: "0x3d4051224018
LayoutTable TABLE", type: "DrawingBoxDecorationBackground"}, visualRect: [8,8
180x135]},
{index: 3, client: "0x3d4051240630 LayoutTableCell TD", type:
"DrawingTableCollapsedBorderRight", rect: [128.000000,75.000000
60.000000x68.000000], cacheIsValid: false, visualRect: [128,75 60x68]},
{index: 4, client: "0x3d40512403c0 LayoutTableCell TD", type:
"DrawingTableCollapsedBorderLeft", rect: [8.000000,75.000000
61.000000x68.000000], cacheIsValid: false, visualRect: [8,75 61x68]},
{index: 5, client: "0x3d4051240288 LayoutTableCell TD", type:
"DrawingTableCollapsedBorderRight", rect: [128.000000,8.000000
60.000000x68.000000], cacheIsValid: true, visualRect: [128,8 60x68]},
{index: 6, client: "0x3d4051240018 LayoutTableCell TD", type:
"DrawingTableCollapsedBorderLeft", rect: [8.000000,8.000000
61.000000x68.000000], cacheIsValid: true, visualRect: [8,8 61x68]},
{index: 7, client: "0x3d4051240630 LayoutTableCell TD", type:
"DrawingTableCollapsedBorderTopBottom", rect: [128.000000,75.000000
60.000000x68.000000], cacheIsValid: false, visualRect: [128,75 60x68]},
{index: 8, client: "0x237615cea170 CollapsedBorderValues", type:
"DrawingTableCollapsedBorderTopBottom", rect: [69.000000,75.000000
59.000000x68.000000], cacheIsValid: true, visualRect: [8,8 180x135]},
{index: 9, client: "0x3d40512403c0 LayoutTableCell TD", type:
"DrawingTableCollapsedBorderTopBottom", rect: [8.000000,75.000000
61.000000x68.000000], cacheIsValid: false, visualRect: [8,75 61x68]},
{index: 10, client: "0x3d4051240288 LayoutTableCell TD", type:
"DrawingTableCollapsedBorderTopBottom", rect: [128.000000,8.000000
60.000000x68.000000], cacheIsValid: true, visualRect: [128,8 60x68]},
{index: 11, client: "0x3d4051240150 LayoutTableCell TD", type:
"DrawingTableCollapsedBorderTopBottom", rect: [69.000000,8.000000
59.000000x68.000000], cacheIsValid: true, visualRect: [69,8 59x68]},
{index: 12, client: "0x3d4051240018 LayoutTableCell TD", type:
"DrawingTableCollapsedBorderTopBottom", rect: [8.000000,8.000000
61.000000x68.000000], cacheIsValid: true, visualRect: [8,8 61x68]},
{index: 13, client: "0x3d4051254010 InlineTextBox 'A'", type:
"DrawingPaintPhaseForeground", rect: [33.000000,33.000000 12.000000x17.000000],
cacheIsValid: true, visualRect: [33,33 12x17]},
{index: 14, client: "0x3d4051254088 InlineTextBox 'B'", type:
"DrawingPaintPhaseForeground", rect: [93.000000,33.000000 11.000000x17.000000],
cacheIsValid: true, visualRect: [93,33 11x17]},
{index: 15, client: "0x3d4051254100 InlineTextBox 'C'", type:
"DrawingPaintPhaseForeground", rect: [152.000000,33.000000 11.000000x17.000000],
cacheIsValid: true, visualRect: [152,33 11x17]},
{index: 16, client: "0x3d4051254178 InlineTextBox 'D'", type:
"DrawingPaintPhaseForeground", rect: [33.000000,100.000000 12.000000x17.000000],
cacheIsValid: true, visualRect: [33,100 12x17]},
{index: 17, client: "0x3d4051254268 InlineTextBox 'F'", type:
"DrawingPaintPhaseForeground", rect: [152.000000,100.000000 9.000000x17.000000],
cacheIsValid: true, visualRect: [152,100 9x17]},
{index: 18, client: "0x3d4051214108 LayoutBlockFlow HTML", type:
"EndSubsequence", cacheIsValid: false, visualRect: [0,0 800x151]}]
new display item list: [{index: 0, client: "0x3d4051204018 LayoutView
#document", type: "DrawingDocumentBackground", rect: [0.000000,0.000000
800.000000x600.000000], cacheIsValid: true},
{index: 1, client: "0x3d4051214108 LayoutBlockFlow HTML", type: "Subsequence",
cacheIsValid: false},
{index: 2, client: "0x3d4051224018 LayoutTable TABLE", type:
"DrawingBoxDecorationBackground", cacheIsValid: true},
{index: 3, client: "0x3d40512403c0 LayoutTableCell TD", type:
"DrawingTableCellBackgroundFromRow", rect: [8.000000,75.000000
61.000000x67.000000], cacheIsValid: false}]
[1:1:1018/174030:2872274298387:ERROR:PaintController.cpp(382)]
"CollapsedBorderValues":"DrawingTableCellBackgroundFromRow"
[1:1:1018/174030:2872274298756:FATAL:PaintController.cpp(56)] Check failed:
false. 
#0 0x7fea21ad6b3e base::debug::StackTrace::StackTrace()
#1 0x7fea21b45e6f logging::LogMessage::~LogMessage()
#2 0x7fea1c80d96a blink::PaintController::useCachedDrawingIfPossible()
#3 0x7fea193d142b blink::DrawingRecorder::useCachedDrawingIfPossible()
#4 0x7fea19ebaa22 blink::TableCellPainter::paintContainerBackgroundBehindCell()
#5 0x7fea19ebcaf0 blink::TableRowPainter::paintBackgroundBehindCell()
#6 0x7fea19ebdb2f blink::TableSectionPainter::paintObject()
#7 0x7fea19ebd5e2 blink::TableSectionPainter::paintSection()
#8 0x7fea19ebd6a7 blink::TableSectionPainter::paint()
#9 0x7fea19c06155 blink::LayoutTableSection::paint()
#10 0x7fea19ebbb40 blink::TablePainter::paintObject()
#11 0x7fea19beb995 blink::LayoutTable::paintObject()
#12 0x7fea19e12696 blink::BlockPainter::paint()
#13 0x7fea19ad8995 blink::LayoutBlock::paint()
#14 0x7fea19e12c2a blink::BlockPainter::paintChild()
#15 0x7fea19e12b7b blink::BlockPainter::paintChildren()
#16 0x7fea19ad89d5 blink::LayoutBlock::paintChildren()
#17 0x7fea19e137f1 blink::BlockPainter::paintContents()
#18 0x7fea19e11d83 blink::BlockFlowPainter::paintContents()
#19 0x7fea19e13578 blink::BlockPainter::paintObject()
#20 0x7fea19ad8a15 blink::LayoutBlock::paintObject()
#21 0x7fea19e12696 blink::BlockPainter::paint()
#22 0x7fea19ad8995 blink::LayoutBlock::paint()
#23 0x7fea19e12c2a blink::BlockPainter::paintChild()
#24 0x7fea19e12b7b blink::BlockPainter::paintChildren()
#25 0x7fea19ad89d5 blink::LayoutBlock::paintChildren()
#26 0x7fea19e137f1 blink::BlockPainter::paintContents()
#27 0x7fea19e11d83 blink::BlockFlowPainter::paintContents()
#28 0x7fea19e13578 blink::BlockPainter::paintObject()
#29 0x7fea19ad8a15 blink::LayoutBlock::paintObject()
#30 0x7fea19e12696 blink::BlockPainter::paint()
#31 0x7fea19ad8995 blink::LayoutBlock::paint()
#32 0x7fea19e7ad5c blink::PaintLayerPainter::paintFragmentWithPhase()
#33 0x7fea19e7ae91
blink::PaintLayerPainter::paintForegroundForFragmentsWithPhase()
#34 0x7fea19e79aa3 blink::PaintLayerPainter::paintForegroundForFragments()
#35 0x7fea19e78c1f blink::PaintLayerPainter::paintLayerContents()
#36 0x7fea19e77b06
blink::PaintLayerPainter::paintLayerContentsCompositingAllPhases()
#37 0x7fea19e76f46 blink::PaintLayerPainter::paintLayer()
#38 0x7fea19e796ae blink::PaintLayerPainter::paintChildren()
#39 0x7fea19e78c84 blink::PaintLayerPainter::paintLayerContents()
#40 0x7fea19c6cfec blink::CompositedLayerMapping::doPaintTask()
#41 0x7fea19c6e292 blink::CompositedLayerMapping::paintContents()
#42 0x7fea1c6d883d blink::GraphicsLayer::paintWithoutCommit()
#43 0x7fea1c6d846f blink::GraphicsLayer::paint()
#44 0x7fea19612fdd blink::FrameView::synchronizedPaintRecursively()
#45 0x7fea19613086 blink::FrameView::synchronizedPaintRecursively()
#46 0x7fea19613086 blink::FrameView::synchronizedPaintRecursively()
#47 0x7fea19613086 blink::FrameView::synchronizedPaintRecursively()
#48 0x7fea19613086 blink::FrameView::synchronizedPaintRecursively()
#49 0x7fea19612648 blink::FrameView::synchronizedPaint()
#50 0x7fea196110eb blink::FrameView::updateLifecyclePhasesInternal()
#51 0x7fea196108f2 blink::FrameView::updateAllLifecyclePhases()
#52 0x7fea19ddb21a blink::PageAnimator::updateAllLifecyclePhases()
#53 0x7fea1c0d3bd5 blink::PageWidgetDelegate::updateAllLifecyclePhases()
#54 0x7fea1c1c44b1 blink::WebViewImpl::updateAllLifecyclePhases()
#55 0x7fea1c1bace1 blink::WebViewFrameWidget::updateAllLifecyclePhases()
#56 0x7fea2463a5c7 content::RenderWidget::UpdateVisualState()
#57 0x7fea2448806a content::RenderWidgetCompositor::UpdateLayerTreeHost()
#58 0x7fea1e7195ca cc::LayerTreeHostInProcess::RequestMainFrameUpdate()
#59 0x7fea1e794cec cc::ProxyMain::BeginMainFrame()
#60 0x7fea1e7c1644
_ZN4base8internal13FunctorTraitsIMN2cc9ProxyMainEFvSt10unique_ptrINS2_28BeginMainFrameAndCommitStateESt14default_deleteIS5_EEEvE6InvokeIRKNS_7WeakPtrIS3_EEJS8_EEEvSA_OT_DpOT0_
#61 0x7fea1e7c150f
_ZN4base8internal12InvokeHelperILb1EvE8MakeItSoIRKMN2cc9ProxyMainEFvSt10unique_ptrINS4_28BeginMainFrameAndCommitStateESt14default_deleteIS7_EEERKNS_7WeakPtrIS5_EEJSA_EEEvOT_OT0_DpOT1_

Received signal 6
#0 0x7fea21ad6b3e base::debug::StackTrace::StackTrace()
#1 0x7fea21ad667f base::debug::(anonymous namespace)::StackDumpSignalHandler()
#2 0x7fea2693f330 <unknown>
#3 0x7fea1510ac37 gsignal
#4 0x7fea1510e028 abort
#5 0x7fea21ad3156 base::debug::(anonymous namespace)::DebugBreak()
#6 0x7fea21ad3138 base::debug::BreakDebugger()
#7 0x7fea21b461bd logging::LogMessage::~LogMessage()
#8 0x7fea1c80d96a blink::PaintController::useCachedDrawingIfPossible()
#9 0x7fea193d142b blink::DrawingRecorder::useCachedDrawingIfPossible()
#10 0x7fea19ebaa22 blink::TableCellPainter::paintContainerBackgroundBehindCell()
#11 0x7fea19ebcaf0 blink::TableRowPainter::paintBackgroundBehindCell()
#12 0x7fea19ebdb2f blink::TableSectionPainter::paintObject()
#13 0x7fea19ebd5e2 blink::TableSectionPainter::paintSection()
#14 0x7fea19ebd6a7 blink::TableSectionPainter::paint()
#15 0x7fea19c06155 blink::LayoutTableSection::paint()
#16 0x7fea19ebbb40 blink::TablePainter::paintObject()
#17 0x7fea19beb995 blink::LayoutTable::paintObject()
#18 0x7fea19e12696 blink::BlockPainter::paint()
#19 0x7fea19ad8995 blink::LayoutBlock::paint()
#20 0x7fea19e12c2a blink::BlockPainter::paintChild()
#21 0x7fea19e12b7b blink::BlockPainter::paintChildren()
#22 0x7fea19ad89d5 blink::LayoutBlock::paintChildren()
#23 0x7fea19e137f1 blink::BlockPainter::paintContents()
#24 0x7fea19e11d83 blink::BlockFlowPainter::paintContents()
#25 0x7fea19e13578 blink::BlockPainter::paintObject()
#26 0x7fea19ad8a15 blink::LayoutBlock::paintObject()
#27 0x7fea19e12696 blink::BlockPainter::paint()
#28 0x7fea19ad8995 blink::LayoutBlock::paint()
#29 0x7fea19e12c2a blink::BlockPainter::paintChild()
#30 0x7fea19e12b7b blink::BlockPainter::paintChildren()
#31 0x7fea19ad89d5 blink::LayoutBlock::paintChildren()
#32 0x7fea19e137f1 blink::BlockPainter::paintContents()
#33 0x7fea19e11d83 blink::BlockFlowPainter::paintContents()
#34 0x7fea19e13578 blink::BlockPainter::paintObject()
#35 0x7fea19ad8a15 blink::LayoutBlock::paintObject()
#36 0x7fea19e12696 blink::BlockPainter::paint()
#37 0x7fea19ad8995 blink::LayoutBlock::paint()
#38 0x7fea19e7ad5c blink::PaintLayerPainter::paintFragmentWithPhase()
#39 0x7fea19e7ae91
blink::PaintLayerPainter::paintForegroundForFragmentsWithPhase()
#40 0x7fea19e79aa3 blink::PaintLayerPainter::paintForegroundForFragments()
#41 0x7fea19e78c1f blink::PaintLayerPainter::paintLayerContents()
#42 0x7fea19e77b06
blink::PaintLayerPainter::paintLayerContentsCompositingAllPhases()
#43 0x7fea19e76f46 blink::PaintLayerPainter::paintLayer()
#44 0x7fea19e796ae blink::PaintLayerPainter::paintChildren()
#45 0x7fea19e78c84 blink::PaintLayerPainter::paintLayerContents()
#46 0x7fea19c6cfec blink::CompositedLayerMapping::doPaintTask()
#47 0x7fea19c6e292 blink::CompositedLayerMapping::paintContents()
#48 0x7fea1c6d883d blink::GraphicsLayer::paintWithoutCommit()
#49 0x7fea1c6d846f blink::GraphicsLayer::paint()
#50 0x7fea19612fdd blink::FrameView::synchronizedPaintRecursively()
#51 0x7fea19613086 blink::FrameView::synchronizedPaintRecursively()
#52 0x7fea19613086 blink::FrameView::synchronizedPaintRecursively()
#53 0x7fea19613086 blink::FrameView::synchronizedPaintRecursively()
#54 0x7fea19613086 blink::FrameView::synchronizedPaintRecursively()
#55 0x7fea19612648 blink::FrameView::synchronizedPaint()
#56 0x7fea196110eb blink::FrameView::updateLifecyclePhasesInternal()
#57 0x7fea196108f2 blink::FrameView::updateAllLifecyclePhases()
#58 0x7fea19ddb21a blink::PageAnimator::updateAllLifecyclePhases()
#59 0x7fea1c0d3bd5 blink::PageWidgetDelegate::updateAllLifecyclePhases()
#60 0x7fea1c1c44b1 blink::WebViewImpl::updateAllLifecyclePhases()
#61 0x7fea1c1bace1 blink::WebViewFrameWidget::updateAllLifecyclePhases()
  r8: 00007ffc1ed56730  r9: 00007fea15224a00 r10: 0000000000000008 r11:
0000000000000202
 r12: 0000000000486c1c r13: 00007ffc1ed5ecf0 r14: 0000000000000001 r15:
0000000000000000
  di: 0000000000000001  si: 0000000000000001  bp: 00007ffc1ed56b00  bx:
00007ffc1ed59d78
  dx: 0000000000000006  ax: 0000000000000000  cx: ffffffffffffffff  sp:
00007ffc1ed569c8
  ip: 00007fea1510ac37 efl: 0000000000000202 cgf: 0000000000000033 erf:
0000000000000000
 trp: 0000000000000000 msk: 0000000000000000 cr2: 0000000000000000
[end of stack trace]

[chrishtr, 2016/10/19 01:13:21]

I think you might be accidentally painting into the incorrect GraphicsLayer.
Each GraphicsLayer has its own PaintController.
Maybe this is related to my other comment about using the right
DisplayItemClient?

   if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(
           paintInfo.context, m_layoutTableCell, type))
     return;
@@ -236,17 +253,17 @@ void TableCellPainter::paintBoxDecorationBackground(
       !m_layoutTableCell.styleRef().boxShadow() && !needsToPaintBorder)
     return;
 
-  if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(
-          paintInfo.context, m_layoutTableCell,
-          DisplayItem::kBoxDecorationBackground))
+  const DisplayItemClient& client = displayItemClient();
+  if (DrawingRecorder::useCachedDrawingIfPossible(
+          paintInfo.context, client, DisplayItem::kBoxDecorationBackground))
     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::kBoxDecorationBackground,
-                                       pixelSnappedIntRect(visualOverflowRect));
+  DrawingRecorder recorder(paintInfo.context, client,
+                           DisplayItem::kBoxDecorationBackground,
+                           pixelSnappedIntRect(visualOverflowRect));
 
   LayoutRect paintRect = paintRectNotIncludingVisualOverflow(paintOffset);
 
@@ -275,13 +292,17 @@ void TableCellPainter::paintMask(const PaintInfo& paintInfo,
       !m_layoutTableCell.firstChild())
     return;
 
-  if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(
-          paintInfo.context, m_layoutTableCell, paintInfo.phase))
+  const DisplayItemClient& client = displayItemClient();
+  if (DrawingRecorder::useCachedDrawingIfPossible(
+          paintInfo.context, client,
+          DisplayItem::paintPhaseToDrawingType(paintInfo.phase)))
     return;
 
   LayoutRect paintRect = paintRectNotIncludingVisualOverflow(paintOffset);
-  LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutTableCell,
-                                       paintInfo.phase, paintRect);
+  DrawingRecorder recorder(
+      paintInfo.context, client,
+      DisplayItem::paintPhaseToDrawingType(paintInfo.phase),
+      FloatRect(paintRect));
   BoxPainter(m_layoutTableCell).paintMaskImages(paintInfo, paintRect);
 }