Reference table via the cell for collapsed border display item client

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

 /*
  * 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, 2008, 2009 Apple Inc.
  *               All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 51 matching lines @@
       m_cellWidthChanged(false),
       m_intrinsicPaddingBefore(0),
       m_intrinsicPaddingAfter(0) {
   // We only update the flags when notified of DOM changes in
   // colSpanOrRowSpanChanged() so we need to set their initial values here in
   // case something asks for colSpan()/rowSpan() before then.
   updateColAndRowSpanFlags();
 }
 
 LayoutTableCell::CollapsedBorderValues::CollapsedBorderValues(
-    const LayoutTable& layoutTable,
+    const LayoutTableCell& layoutTableCell,
     const CollapsedBorderValue& startBorder,
     const CollapsedBorderValue& endBorder,
     const CollapsedBorderValue& beforeBorder,
     const CollapsedBorderValue& afterBorder)
-    : m_layoutTable(layoutTable),
+    : m_layoutTableCell(layoutTableCell),
       m_startBorder(startBorder),
       m_endBorder(endBorder),
       m_beforeBorder(beforeBorder),
       m_afterBorder(afterBorder) {}
 
 void LayoutTableCell::CollapsedBorderValues::setCollapsedBorderValues(
     const CollapsedBorderValues& other) {
   m_startBorder = other.startBorder();
   m_endBorder = other.endBorder();
   m_beforeBorder = other.beforeBorder();
   m_afterBorder = other.afterBorder();
 }
 
 String LayoutTableCell::CollapsedBorderValues::debugName() const {
   return "CollapsedBorderValues";
 }
 
 LayoutRect LayoutTableCell::CollapsedBorderValues::visualRect() const {
-  return m_layoutTable.visualRect();
+  return m_layoutTableCell.table()->visualRect();
 }
 
 void LayoutTableCell::willBeRemovedFromTree() {
   LayoutBlockFlow::willBeRemovedFromTree();
 
   section()->setNeedsCellRecalc();
 
   // When borders collapse, removing a cell can affect the the width of
   // neighboring cells.
   LayoutTable* enclosingTable = table();
@@ skipping 1207 matching lines @@
   for (size_t i = 0; i < count; ++i) {
     if (borderValues[i].isSameIgnoringColor(borderValue))
       return;
   }
   borderValues.append(borderValue);
 }
 
 void LayoutTableCell::collectBorderValues(
     LayoutTable::CollapsedBorderValues& borderValues) {
   CollapsedBorderValues newValues(
-      *table(), computeCollapsedStartBorder(), computeCollapsedEndBorder(),
+      *this, computeCollapsedStartBorder(), computeCollapsedEndBorder(),
       computeCollapsedBeforeBorder(), computeCollapsedAfterBorder());
 
   bool changed = false;
   if (!newValues.startBorder().isVisible() &&
       !newValues.endBorder().isVisible() &&
       !newValues.beforeBorder().isVisible() &&
       !newValues.afterBorder().isVisible()) {
     changed = !!m_collapsedBorderValues;
     m_collapsedBorderValues = nullptr;
   } else if (!m_collapsedBorderValues) {
     changed = true;
     m_collapsedBorderValues = WTF::wrapUnique(new CollapsedBorderValues(
-        *table(), newValues.startBorder(), newValues.endBorder(),
+        *this, newValues.startBorder(), newValues.endBorder(),
         newValues.beforeBorder(), newValues.afterBorder()));
   } else {
     // We check visuallyEquals so that the table cell is invalidated only if a
     // changed collapsed border is visible in the first place.
     changed = !m_collapsedBorderValues->startBorder().visuallyEquals(
                   newValues.startBorder()) ||
               !m_collapsedBorderValues->endBorder().visuallyEquals(
                   newValues.endBorder()) ||
               !m_collapsedBorderValues->beforeBorder().visuallyEquals(
                   newValues.beforeBorder()) ||
               !m_collapsedBorderValues->afterBorder().visuallyEquals(
                   newValues.afterBorder());
     if (changed)
       m_collapsedBorderValues->setCollapsedBorderValues(newValues);
   }
 
   // If collapsed borders changed, invalidate the cell's display item client on
   // the table's backing.
   // TODO(crbug.com/451090#c5): Need a way to invalidate/repaint the borders
   // only.
-  if (changed)
+  if (changed) {
     ObjectPaintInvalidator(*table())
         .slowSetPaintingLayerNeedsRepaintAndInvalidateDisplayItemClient(
             *this, PaintInvalidationStyleChange);
+  }
 
   addBorderStyle(borderValues, newValues.startBorder());
   addBorderStyle(borderValues, newValues.endBorder());
   addBorderStyle(borderValues, newValues.beforeBorder());
   addBorderStyle(borderValues, newValues.afterBorder());
 }
 
 void LayoutTableCell::sortBorderValues(
     LayoutTable::CollapsedBorderValues& borderValues) {
   std::sort(borderValues.begin(), borderValues.end(), compareBorders);
@@ skipping 119 matching lines @@
 }
 
 bool LayoutTableCell::hasLineIfEmpty() const {
   if (node() && hasEditableStyle(*node()))
     return true;
 
   return LayoutBlock::hasLineIfEmpty();
 }
 
 }  // namespace blink