Replace LayoutTableCell::AbsoluteColumnIndex() with EffectiveColumnIndex()

third_party/WebKit/Source/modules/accessibility/AXTable.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 147 matching lines @@
   if (Traversal<HTMLTableColElement>::FirstChild(*table_element))
     return true;
 
   // go through the cell's and check for tell-tale signs of "data" table status
   // cells have borders, or use attributes like headers, abbr, scope or axis
   table->RecalcSectionsIfNeeded();
   LayoutTableSection* first_body = table->FirstBody();
   if (!first_body)
     return false;
 
-  int num_cols_in_first_body = first_body->NumEffectiveColumns();
+  int num_cols_in_first_body = first_body->MaxNumEffectiveColumnsOfRows();
   int num_rows = first_body->NumRows();
 
   // If there's only one cell, it's not a good AXTable candidate.
   if (num_rows == 1 && num_cols_in_first_body == 1)
     return false;
 
   // If there are at least 20 rows, we'll call it a data table.
   if (num_rows >= 20)
     return true;
 
@@ skipping 18 matching lines @@
   unsigned cells_with_bottom_border = 0;
   unsigned cells_with_left_border = 0;
   unsigned cells_with_right_border = 0;
 
   Color alternating_row_colors[5];
   int alternating_row_color_count = 0;
 
   int headers_in_first_column_count = 0;
   for (int row = 0; row < num_rows; ++row) {
     int headers_in_first_row_count = 0;
-    int n_cols = first_body->NumCols(row);
+    int n_cols = first_body->NumEffectiveColumns(row);
     for (int col = 0; col < n_cols; ++col) {
       LayoutTableCell* cell = first_body->PrimaryCellAt(row, col);
       if (!cell)
         continue;
       Node* cell_node = cell->GetNode();
       if (!cell_node)
         continue;
 
       if (cell->Size().Width() < 1 || cell->Size().Height() < 1)
         continue;
@@ skipping 204 matching lines @@
       rows_.push_back(row);
       if (!row->AccessibilityIsIgnored())
         children_.push_back(row);
       appended_rows.insert(row);
     }
 
     table_section = table->SectionBelow(table_section, kSkipEmptySections);
   }
 
   // make the columns based on the number of columns in the first body
-  unsigned length = initial_table_section->NumEffectiveColumns();
+  unsigned length = initial_table_section->MaxNumEffectiveColumnsOfRows();
   for (unsigned i = 0; i < length; ++i) {
     AXTableColumn* column = ToAXTableColumn(ax_cache.GetOrCreate(kColumnRole));
     column->SetColumnIndex((int)i);
     column->SetParent(this);
     columns_.push_back(column);
     if (!column->AccessibilityIsIgnored())
       children_.push_back(column);
   }
 
   AXObjectImpl* header_container_object = HeaderContainer();
@@ skipping 166 matching lines @@
 }
 
 DEFINE_TRACE(AXTable) {
   visitor->Trace(rows_);
   visitor->Trace(columns_);
   visitor->Trace(header_container_);
   AXLayoutObject::Trace(visitor);
 }
 
 }  // namespace blink