Merge 59495 - 20100514 Abhishek Arya <inferno@chromium.org>...

WebCore/rendering/FixedTableLayout.cpp

 /*
  * Copyright (C) 2002 Lars Knoll (knoll@kde.org)
  *           (C) 2002 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006 Apple Computer, Inc.
  *
  * 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 148 matching lines @@
                     cell->calcPrefWidths();
 
                 Length w = cell->styleOrColWidth();
                 int span = cell->colSpan();
                 int effWidth = 0;
                 if (w.isFixed() && w.isPositive())
                     effWidth = w.value();
                 
                 int usedSpan = 0;
                 int i = 0;
-                while (usedSpan < span) {
-                    ASSERT(cCol + i < nEffCols);
+                while (usedSpan < span && cCol + i < nEffCols) {
                     int eSpan = m_table->spanOfEffCol(cCol + i);
                     // Only set if no col element has already set it.
                     if (m_width[cCol + i].isAuto() && w.type() != Auto) {
                         m_width[cCol + i].setRawValue(w.type(), w.rawValue() * eSpan / span);
                         usedWidth += effWidth * eSpan / span;
                     }
                     usedSpan += eSpan;
                     i++;
                 }
                 cCol += i;
@@ skipping 145 matching lines @@
     for (int i = 0; i < nEffCols; i++) {
         m_table->columnPositions()[i] = pos;
         pos += calcWidth[i] + hspacing;
     }
     int colPositionsSize = m_table->columnPositions().size();
     if (colPositionsSize > 0)
         m_table->columnPositions()[colPositionsSize - 1] = pos;
 }
 
 } // namespace WebCore