Fix blink_perf.paint regression about tables

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 146 matching lines @@
   if (Traversal<HTMLTableColElement>::firstChild(*tableElement))
     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* firstBody = table->firstBody();
   if (!firstBody)
     return false;
 
-  int numCols = firstBody->numEffectiveColumns();
+  int numColsInFirstBody = firstBody->numEffectiveColumns();
   int numRows = firstBody->numRows();
 
   // If there's only one cell, it's not a good AXTable candidate.
-  if (numRows == 1 && numCols == 1)
+  if (numRows == 1 && numColsInFirstBody == 1)
     return false;
 
   // If there are at least 20 rows, we'll call it a data table.
   if (numRows >= 20)
     return true;
 
   // Store the background color of the table to check against cell's background
   // colors.
   const ComputedStyle* tableStyle = table->style();
   if (!tableStyle)
@@ skipping 14 matching lines @@
   unsigned cellsWithBottomBorder = 0;
   unsigned cellsWithLeftBorder = 0;
   unsigned cellsWithRightBorder = 0;
 
   Color alternatingRowColors[5];
   int alternatingRowColorCount = 0;
 
   int headersInFirstColumnCount = 0;
   for (int row = 0; row < numRows; ++row) {
     int headersInFirstRowCount = 0;
-    for (int col = 0; col < numCols; ++col) {
+    int nCols = firstBody->numCols(row);
+    for (int col = 0; col < nCols; ++col) {
       LayoutTableCell* cell = firstBody->primaryCellAt(row, col);
       if (!cell)
         continue;
       Node* cellNode = cell->node();
       if (!cellNode)
         continue;
 
       if (cell->size().width() < 1 || cell->size().height() < 1)
         continue;
 
@@ skipping 67 matching lines @@
         const ComputedStyle* rowComputedStyle = layoutRow->style();
         if (!rowComputedStyle)
           continue;
         Color rowColor =
             rowComputedStyle->visitedDependentColor(CSSPropertyBackgroundColor);
         alternatingRowColors[alternatingRowColorCount] = rowColor;
         alternatingRowColorCount++;
       }
     }
 
-    if (!row && headersInFirstRowCount == numCols && numCols > 1)
+    if (!row && headersInFirstRowCount == numColsInFirstBody &&
+        numColsInFirstBody > 1)
       return true;
   }
 
   if (headersInFirstColumnCount == numRows && numRows > 1)
     return true;
 
   // if there is less than two valid cells, it's not a data table
   if (validCellCount <= 1)
     return false;
 
@@ skipping 299 matching lines @@
 }
 
 DEFINE_TRACE(AXTable) {
   visitor->trace(m_rows);
   visitor->trace(m_columns);
   visitor->trace(m_headerContainer);
   AXLayoutObject::trace(visitor);
 }
 
 }  // namespace blink