Use appropriate background object visual rect for composited table cell backgrounds.

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 50 matching lines @@
 }
 
 static EBorderStyle collapsedBorderStyle(EBorderStyle style) {
   if (style == BorderStyleOutset)
     return BorderStyleGroove;
   if (style == BorderStyleInset)
     return BorderStyleRidge;
   return style;
 }
 
-const DisplayItemClient& TableCellPainter::displayItemClientForBorders() const {
+const DisplayItemClient&
+TableCellPainter::displayItemClientRespectingCompositing() const {
   // TODO(wkorman): We may need to handle PaintInvalidationDelayedFull.
   // http://crbug.com/657186
   return m_layoutTableCell.usesTableAsAdditionalDisplayItemClient()
              ? static_cast<const DisplayItemClient&>(
-                   *m_layoutTableCell.collapsedBorderValues())
+                   *m_layoutTableCell.compositedTableCell())
              : m_layoutTableCell;
 }
 
 void TableCellPainter::paintCollapsedBorders(
     const PaintInfo& paintInfo,
     const LayoutPoint& paintOffset,
     const CollapsedBorderValue& currentBorderValue) {
   if (m_layoutTableCell.style()->visibility() != EVisibility::Visible)
     return;
 
@@ skipping 37 matching lines @@
   // Adjust our x/y/width/height so that we paint the collapsed borders at the
   // correct location.
   LayoutRect paintRect =
       paintRectNotIncludingVisualOverflow(adjustedPaintOffset);
   IntRect borderRect = pixelSnappedIntRect(
       paintRect.x() - leftWidth / 2, paintRect.y() - topWidth / 2,
       paintRect.width() + leftWidth / 2 + (rightWidth + 1) / 2,
       paintRect.height() + topWidth / 2 + (bottomWidth + 1) / 2);
 
   GraphicsContext& graphicsContext = paintInfo.context;
-  const DisplayItemClient& client = displayItemClientForBorders();
+  const DisplayItemClient& client = displayItemClientRespectingCompositing();
   if (DrawingRecorder::useCachedDrawingIfPossible(
           graphicsContext, client,
           static_cast<DisplayItem::Type>(displayItemType)))
     return;
 
   DrawingRecorder recorder(graphicsContext, client,
                            static_cast<DisplayItem::Type>(displayItemType),
                            borderRect);
   Color cellColor = m_layoutTableCell.resolveColor(CSSPropertyColor);
 
@@ skipping 43 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 = displayItemClientRespectingCompositing();
+  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