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

third_party/WebKit/Source/core/layout/LayoutTableCell.h

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2013 Apple Inc.
  *               All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 270 matching lines @@
   bool isFirstOrLastCellInRow() const {
     return !table()->cellAfter(this) || !table()->cellBefore(this);
   }
 #endif
 
   const char* name() const override { return "LayoutTableCell"; }
 
   bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const override;
   void invalidateDisplayItemClients(PaintInvalidationReason) const override;
 
+  // TODO(wkorman): Consider making this a struct again as it once was.
   // TODO(wkorman): Consider renaming to more clearly differentiate from
   // CollapsedBorderValue.
-  class CollapsedBorderValues : public DisplayItemClient {
+  class CollapsedBorderValues {
    public:
-    CollapsedBorderValues(const LayoutTable&,
-                          const CollapsedBorderValue& startBorder,
+    CollapsedBorderValues(const CollapsedBorderValue& startBorder,
                           const CollapsedBorderValue& endBorder,
                           const CollapsedBorderValue& beforeBorder,
                           const CollapsedBorderValue& afterBorder);
 
     const CollapsedBorderValue& startBorder() const { return m_startBorder; }
     const CollapsedBorderValue& endBorder() const { return m_endBorder; }
     const CollapsedBorderValue& beforeBorder() const { return m_beforeBorder; }
     const CollapsedBorderValue& afterBorder() const { return m_afterBorder; }
 
     void setCollapsedBorderValues(const CollapsedBorderValues& other);
 
+   private:
+    CollapsedBorderValue m_startBorder;
+    CollapsedBorderValue m_endBorder;
+    CollapsedBorderValue m_beforeBorder;
+    CollapsedBorderValue m_afterBorder;
+  };
+
+  // Composited table cells may paint content such as borders and backgrounds
+  // into their table's graphics layer. In such cases we must use the table's
+  // visual rect for that painting. Thus, we use this class to act as a separate
+  // display item client for unique id purposes on a per-cell basis.
+  class CompositedTableCell : public DisplayItemClient {
+   public:
+    CompositedTableCell(const LayoutTable&);
+
     // DisplayItemClient methods.
     String debugName() const;
     LayoutRect visualRect() const;
 
    private:
     const LayoutTable& m_layoutTable;
-    CollapsedBorderValue m_startBorder;
-    CollapsedBorderValue m_endBorder;
-    CollapsedBorderValue m_beforeBorder;
-    CollapsedBorderValue m_afterBorder;
   };
 
   bool usesTableAsAdditionalDisplayItemClient() const;
+  const CompositedTableCell* compositedTableCell() const;
   const CollapsedBorderValues* collapsedBorderValues() const {
     return m_collapsedBorderValues.get();
   }
 
   LayoutRect debugRect() const override;
 
   void adjustChildDebugRect(LayoutRect&) const override;
 
   // A table cell's location is relative to its containing section.
   LayoutBox* locationContainer() const override { return section(); }
 
  protected:
+  void ensureIsReadyForPaintInvalidation() override;
   void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
   void computePreferredLogicalWidths() override;
 
   void addLayerHitTestRects(LayerHitTestRects&,
                             const PaintLayer* currentCompositedLayer,
                             const LayoutPoint& layerOffset,
                             const LayoutRect& containerRect) const override;
 
  private:
   bool isOfType(LayoutObjectType type) const override {
@@ skipping 82 matching lines @@
 
   // The intrinsic padding.
   // See class comment for what they are.
   //
   // Note: Those fields are using non-subpixel units (int)
   // because we don't do fractional arithmetic on tables.
   int m_intrinsicPaddingBefore;
   int m_intrinsicPaddingAfter;
 
   std::unique_ptr<CollapsedBorderValues> m_collapsedBorderValues;
+  std::unique_ptr<CompositedTableCell> m_compositedTableCell;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTableCell, isTableCell());
 
 inline LayoutTableCell* LayoutTableCell::previousCell() const {
   return toLayoutTableCell(LayoutObject::previousSibling());
 }
 
 inline LayoutTableCell* LayoutTableCell::nextCell() const {
   return toLayoutTableCell(LayoutObject::nextSibling());
 }
 
 inline LayoutTableCell* LayoutTableRow::firstCell() const {
   return toLayoutTableCell(firstChild());
 }
 
 inline LayoutTableCell* LayoutTableRow::lastCell() const {
   return toLayoutTableCell(lastChild());
 }
 
 }  // namespace blink
 
 #endif  // LayoutTableCell_h