Replace LayoutTableCell::AbsoluteColumnIndex() with EffectiveColumnIndex()

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

 /*
  * Copyright (C) 2002 Lars Knoll (knoll@kde.org)
  *           (C) 2002 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2008, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License.
  *
@@ skipping 37 matching lines @@
     if (child->IsLayoutTableCol()) {
       // LayoutTableCols don't have the concept of preferred logical width, but
       // we need to clear their dirty bits so that if we call
       // setPreferredWidthsDirty(true) on a col or one of its descendants, we'll
       // mark it's ancestors as dirty.
       ToLayoutTableCol(child)->ClearPreferredLogicalWidthsDirtyBits();
     } else if (child->IsTableSection()) {
       LayoutTableSection* section = ToLayoutTableSection(child);
       unsigned num_rows = section->NumRows();
       for (unsigned i = 0; i < num_rows; i++) {
-        if (eff_col >= section->NumCols(i))
+        if (eff_col >= section->NumEffectiveColumns(i))
           continue;
         auto& grid_cell = section->GridCellAt(i, eff_col);
         LayoutTableCell* cell = grid_cell.PrimaryCell();
 
         if (grid_cell.InColSpan() || !cell)
           continue;
         column_layout.column_has_no_cells = false;
 
         if (cell->MaxPreferredLogicalWidth())
           column_layout.empty_cells_only = false;
@@ skipping 93 matching lines @@
 
   unsigned n_eff_cols = table_->NumEffectiveColumns();
   layout_struct_.resize(n_eff_cols);
   layout_struct_.Fill(Layout());
   span_cells_.Fill(0);
 
   Length group_logical_width;
   unsigned current_column = 0;
   for (LayoutTableCol* column = table_->FirstColumn(); column;
        column = column->NextColumn()) {
-    if (column->IsTableColumnGroupWithColumnChildren()) {
+    if (!column->IsInnermost()) {
       group_logical_width = column->Style()->LogicalWidth();
     } else {
       Length col_logical_width = column->Style()->LogicalWidth();
       // FIXME: calc() on tables should be handled consistently with other
       // lengths. See bug: https://crbug.com/382725
       if (col_logical_width.IsCalculated() || col_logical_width.IsAuto())
         col_logical_width = group_logical_width;
       // TODO(alancutter): Make this work correctly for calc lengths.
       if ((col_logical_width.IsFixed() ||
            col_logical_width.IsPercentOrCalc()) &&
@@ skipping 176 matching lines @@
       break;
 
     unsigned span = cell->ColSpan();
 
     Length cell_logical_width = cell->StyleOrColLogicalWidth();
     // FIXME: calc() on tables should be handled consistently with other
     // lengths. See bug: https://crbug.com/382725
     if (cell_logical_width.IsZero() || cell_logical_width.IsCalculated())
       cell_logical_width = Length();  // Make it Auto
 
-    unsigned eff_col =
-        table_->AbsoluteColumnToEffectiveColumn(cell->AbsoluteColumnIndex());
+    unsigned eff_col = cell->EffectiveColumnIndex();
     size_t last_col = eff_col;
     int cell_min_logical_width =
         (cell->MinPreferredLogicalWidth() + spacing_in_row_direction).ToInt();
     int cell_max_logical_width =
         (cell->MaxPreferredLogicalWidth() + spacing_in_row_direction).ToInt();
     float total_percent = 0;
     int span_min_logical_width = 0;
     int span_max_logical_width = 0;
     bool all_cols_are_percent = true;
     bool all_cols_are_fixed = true;
@@ skipping 492 matching lines @@
       int reduce = available * min_max_diff / logical_width_beyond_min;
       layout_struct_[i].computed_logical_width += reduce;
       available -= reduce;
       logical_width_beyond_min -= min_max_diff;
       if (available >= 0)
         break;
     }
   }
 }
 }  // namespace blink