Replace LayoutTableCell::AbsoluteColumnIndex() with EffectiveColumnIndex()

third_party/WebKit/Source/core/layout/LayoutTableCol.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, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 149 matching lines @@
   // column is the next column/column-group after its column-group.
   if (!next && Parent()->IsLayoutTableCol())
     next = Parent()->NextSibling();
 
   for (; next && !next->IsLayoutTableCol(); next = next->NextSibling()) {
   }
 
   return ToLayoutTableCol(next);
 }
 
+LayoutTableCol* LayoutTableCol::NextInnermostColumn() const {
+  auto* col = NextColumn();
+  while (col && !col->IsInnermost())
+    col = col->NextColumn();
+  return col;
+}
+
 BorderValue LayoutTableCol::BorderAdjoiningCellStartBorder(
     const LayoutTableCell*) const {
   return Style()->BorderStart();
 }
 
 BorderValue LayoutTableCol::BorderAdjoiningCellEndBorder(
     const LayoutTableCell*) const {
   return Style()->BorderEnd();
 }
 
 BorderValue LayoutTableCol::BorderAdjoiningCellBefore(
     const LayoutTableCell* cell) const {
   DCHECK_EQ(Table()
-                ->ColElementAtAbsoluteColumn(cell->AbsoluteColumnIndex() +
-                                             cell->ColSpan())
+                ->ColAndColGroupAtEffectiveColumn(
+                    cell->EffectiveColumnIndexOfCellAfter())
                 .InnermostColOrColGroup(),
             this);
   return Style()->BorderStart();
 }
 
 BorderValue LayoutTableCol::BorderAdjoiningCellAfter(
     const LayoutTableCell* cell) const {
-  DCHECK_EQ(Table()
-                ->ColElementAtAbsoluteColumn(cell->AbsoluteColumnIndex() - 1)
-                .InnermostColOrColGroup(),
-            this);
+  DCHECK_EQ(
+      Table()
+          ->ColAndColGroupAtEffectiveColumn(cell->EffectiveColumnIndex() - 1)
+          .InnermostColOrColGroup(),
+      this);
   return Style()->BorderEnd();
 }
 
 }  // namespace blink