Replace LayoutTableCell::AbsoluteColumnIndex() with EffectiveColumnIndex()

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 91 matching lines @@
   // Called from HTMLTableCellElement.
   void ColSpanOrRowSpanChanged();
 
   void SetAbsoluteColumnIndex(unsigned column) {
     if (UNLIKELY(column > kMaxColumnIndex))
       CRASH();
 
     absolute_column_index_ = column;
   }
 
-  bool HasSetAbsoluteColumnIndex() const {
-    return absolute_column_index_ != kUnsetColumnIndex;
+  // See LayoutTable.h for definition of absolute and effective columns.
+  // In most cases we should use EffectiveColumnIndex() instead of
+  // AbsolutColumnIndex().
+  unsigned AbsoluteColumnIndex() const { return absolute_column_index_; }
+  unsigned EffectiveColumnIndex() const {
+    DCHECK_NE(absolute_column_index_, kUnsetColumnIndex);
+    return Table()->AbsoluteColumnToEffectiveColumn(absolute_column_index_);
   }
-
-  unsigned AbsoluteColumnIndex() const {
-    DCHECK(HasSetAbsoluteColumnIndex());
-    return absolute_column_index_;
+  // Returns effective column index, of the cell after this cell, or of the
+  // imaginary cell after this cell if there is no cell after this cell.
+  unsigned EffectiveColumnIndexOfCellAfter() const {
+    return Table()->AbsoluteColumnToEffectiveColumn(absolute_column_index_ +
+                                                    ColSpan());
   }
 
   LayoutTableRow* Row() const { return ToLayoutTableRow(Parent()); }
   LayoutTableSection* Section() const {
     return ToLayoutTableSection(Parent()->Parent());
   }
   LayoutTable* Table() const {
     return ToLayoutTable(Parent()->Parent()->Parent());
   }
+  LayoutTable::ColAndColGroup GetColAndColGroup() const {
+    return Table()->ColAndColGroupAtEffectiveColumn(EffectiveColumnIndex());
+  }
 
   LayoutTableCell* PreviousCell() const;
   LayoutTableCell* NextCell() const;
 
   unsigned RowIndex() const {
     // This function shouldn't be called on a detached cell.
     DCHECK(Row());
     return Row()->RowIndex();
   }
 
   Length StyleOrColLogicalWidth() const {
     Length style_width = Style()->LogicalWidth();
     if (!style_width.IsAuto())
       return style_width;
     if (LayoutTableCol* first_column =
-            Table()
-                ->ColElementAtAbsoluteColumn(AbsoluteColumnIndex())
-                .InnermostColOrColGroup())
+            GetColAndColGroup().InnermostColOrColGroup())
       return LogicalWidthFromColumns(first_column, style_width);
     return style_width;
   }
 
   int LogicalHeightFromStyle() const {
     Length height = Style()->LogicalHeight();
     int style_logical_height =
         height.IsIntrinsicOrAuto()
             ? 0
             : ValueForLength(height, LayoutUnit()).ToInt();
@@ skipping 205 matching lines @@
 
   void AddLayerHitTestRects(LayerHitTestRects&,
                             const PaintLayer* current_composited_layer,
                             const LayoutPoint& layer_offset,
                             const LayoutRect& container_rect) const override;
 
   PaintInvalidationReason InvalidatePaint(
       const PaintInvalidatorContext&) const override;
 
  private:
+  friend class LayoutTableCellDeathTest;
   friend class LayoutTableCellTest;
 
   bool IsOfType(LayoutObjectType type) const override {
     return type == kLayoutObjectTableCell || LayoutBlockFlow::IsOfType(type);
   }
 
   void WillBeRemovedFromTree() override;
 
   void UpdateLogicalWidth() override;
 
@@ skipping 105 matching lines @@
   return ToLayoutTableCell(FirstChild());
 }
 
 inline LayoutTableCell* LayoutTableRow::LastCell() const {
   return ToLayoutTableCell(LastChild());
 }
 
 }  // namespace blink
 
 #endif  // LayoutTableCell_h