Changeset 100067 in webkit

Timestamp:

Nov 11, 2011, 8:40:28 PM (15 years ago)

Author:

ojan@chromium.org

Message:

Source/WebCore: Unreviewed. Rollout ​http://trac.webkit.org/changeset/99744.
​https://bugs.webkit.org/show_bug.cgi?id=72203
r99744 causes crash in Chromium's dom_perf test.

• rendering/RenderTable.cpp:

(WebCore::RenderTable::splitColumn):
(WebCore::RenderTable::appendColumn):

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::addCell):
(WebCore::RenderTableSection::recalcCells):
(WebCore::RenderTableSection::appendColumn):

LayoutTests: Unreviewed. Rollout ​http://trac.webkit.org/changeset/99744.
​https://bugs.webkit.org/show_bug.cgi?id=72203
r99744 causes crash in Chromium's dom_perf test.

• fast/table/crash-splitColumn-2-expected.txt: Removed.
• fast/table/crash-splitColumn-2.html: Removed.
• fast/table/crash-splitColumn-3-expected.txt: Removed.
• fast/table/crash-splitColumn-3.html: Removed.
• fast/table/crash-splitColumn-expected.txt: Removed.
• fast/table/crash-splitColumn.html: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/table/crash-splitColumn-2-expected.txt (deleted)
• LayoutTests/fast/table/crash-splitColumn-2.html (deleted)
• LayoutTests/fast/table/crash-splitColumn-3-expected.txt (deleted)
• LayoutTests/fast/table/crash-splitColumn-3.html (deleted)
• LayoutTests/fast/table/crash-splitColumn-expected.txt (deleted)
• LayoutTests/fast/table/crash-splitColumn.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderTable.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderTableSection.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-11  Ojan Vafai  <ojan@chromium.org>
+
+        Unreviewed. Rollout http://trac.webkit.org/changeset/99744.
+        https://bugs.webkit.org/show_bug.cgi?id=72203
+        r99744 causes crash in Chromium's dom_perf test.
+ 
+        * fast/table/crash-splitColumn-2-expected.txt: Removed.
+        * fast/table/crash-splitColumn-2.html: Removed.
+        * fast/table/crash-splitColumn-3-expected.txt: Removed.
+        * fast/table/crash-splitColumn-3.html: Removed.
+        * fast/table/crash-splitColumn-expected.txt: Removed.
+        * fast/table/crash-splitColumn.html: Removed.
+
 2011-11-11  Dominic Mazzoni  <dmazzoni@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-11  Ojan Vafai  <ojan@chromium.org>
+
+        Unreviewed. Rollout http://trac.webkit.org/changeset/99744.
+        https://bugs.webkit.org/show_bug.cgi?id=72203
+        r99744 causes crash in Chromium's dom_perf test.
+
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::splitColumn):
+        (WebCore::RenderTable::appendColumn):
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::addCell):
+        (WebCore::RenderTableSection::recalcCells):
+        (WebCore::RenderTableSection::appendColumn):
+
 2011-11-11  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -646 +646 @@
     m_columns[position + 1].span = oldSpan - firstSpan;
 
-    // Propagate the change in our columns representation to the sections that don't need
-    // cell recalc. If they do, they will be synced up directly with m_columns later.
+    // change width of all rows.
     for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
-        if (!child->isTableSection())
-            continue;
-
-        RenderTableSection* section = toRenderTableSection(child);
-        if (section->needsCellRecalc())
-            continue;
-
-        section->splitColumn(position, firstSpan);
+        if (child->isTableSection())
+            toRenderTableSection(child)->splitColumn(position, firstSpan);
     }
 
@@ -665 +658 @@
 void RenderTable::appendColumn(int span)
 {
-    unsigned pos = m_columns.size();
-    unsigned newSize = pos + 1;
+    // easy case.
+    int pos = m_columns.size();
+    int newSize = pos + 1;
     m_columns.grow(newSize);
     m_columns[pos].span = span;
 
-    // Propagate the change in our columns representation to the sections that don't need
-    // cell recalc. If they do, they will be synced up directly with m_columns later.
+    // change width of all rows.
     for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
-        if (!child->isTableSection())
-            continue;
-
-        RenderTableSection* section = toRenderTableSection(child);
-        if (section->needsCellRecalc())
-            continue;
-
-        section->appendColumn(pos);
+        if (child->isTableSection())
+            toRenderTableSection(child)->appendColumn(pos);
     }
 

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -188 +188 @@
 void RenderTableSection::addCell(RenderTableCell* cell, RenderTableRow* row)
 {
-    // We don't insert the cell if we need cell recalc as our internal columns' representation
-    // will have drifted from the table's representation. Also recalcCells will call addCell
-    // at a later time after sync'ing our columns' with the table's.
-    if (needsCellRecalc())
-        return;
-
     int rSpan = cell->rowSpan();
     int cSpan = cell->colSpan();
@@ -1123 +1117 @@
 void RenderTableSection::recalcCells()
 {
-    ASSERT(m_needsCellRecalc);
-    // We reset the flag here to ensure that |addCell| works. This is safe to do as
-    // we clear the grid and properly rebuild it during |addCell|.
-    m_needsCellRecalc = false;
-
     m_cCol = 0;
     m_cRow = 0;
@@ -1154 +1143 @@
 
     m_grid.shrinkToFit();
+    m_needsCellRecalc = false;
     setNeedsLayout(true);
 }
@@ -1186 +1176 @@
 void RenderTableSection::appendColumn(int pos)
 {
-    ASSERT(!m_needsCellRecalc);
-
     for (unsigned row = 0; row < m_grid.size(); ++row)
         m_grid[row].row.resize(pos + 1);