Fix painting background for composited table cells in a non-composited row.

third_party/WebKit/Source/core/paint/TableCellPainter.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/TableCellPainter.h"
 
 #include "core/layout/LayoutTableCell.h"
 #include "core/paint/BlockPainter.h"
 #include "core/paint/BoxPainter.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
@@ skipping 53 matching lines @@
   if (style == BorderStyleOutset)
     return BorderStyleGroove;
   if (style == BorderStyleInset)
     return BorderStyleRidge;
   return 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;
 }
 
+const DisplayItemClient& TableCellPainter::displayItemClientForBackground()
+    const {
+  return m_layoutTableCell.usesCompositedCellDisplayItemClients()
+             ? static_cast<const DisplayItemClient&>(
+                   *m_layoutTableCell.rowBackgroundDisplayItemClient())
+             : m_layoutTableCell;
+}
+
 void TableCellPainter::paintCollapsedBorders(
     const PaintInfo& paintInfo,
     const LayoutPoint& paintOffset,
     const CollapsedBorderValue& currentBorderValue) {
   if (m_layoutTableCell.style()->visibility() != EVisibility::Visible)
     return;
 
   LayoutPoint adjustedPaintOffset = paintOffset + m_layoutTableCell.location();
   if (!BlockPainter(m_layoutTableCell)
            .intersectsPaintRect(paintInfo, adjustedPaintOffset))
@@ skipping 98 matching lines @@
   if (!BlockPainter(m_layoutTableCell)
            .intersectsPaintRect(paintInfo, adjustedPaintOffset))
     return;
 
   LayoutTable* table = m_layoutTableCell.table();
   if (!table->collapseBorders() &&
       m_layoutTableCell.style()->emptyCells() == EEmptyCells::Hide &&
       !m_layoutTableCell.firstChild())
     return;
 
-  if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(
-          paintInfo.context, m_layoutTableCell, type))
+  const DisplayItemClient& client = displayItemClientForBackground();
+  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);
 }
 
 void TableCellPainter::paintBackground(const PaintInfo& paintInfo,
                                        const LayoutRect& paintRect,
                                        const LayoutObject& backgroundObject) {
   if (m_layoutTableCell.backgroundStolenForBeingBody())
     return;
 
   Color c = backgroundObject.resolveColor(CSSPropertyBackgroundColor);
@@ skipping 82 matching lines @@
   BoxPainter(m_layoutTableCell).paintMaskImages(paintInfo, paintRect);
 }
 
 LayoutRect TableCellPainter::paintRectNotIncludingVisualOverflow(
     const LayoutPoint& paintOffset) {
   return LayoutRect(paintOffset,
                     LayoutSize(m_layoutTableCell.pixelSnappedSize()));
 }
 
 }  // namespace blink