Title: [105824] branches/chromium/963
- Revision
- 105824
- Author
- [email protected]
- Date
- 2012-01-24 15:37:47 -0800 (Tue, 24 Jan 2012)
Log Message
Revert 105795 - Merge 105685 - Crash in WebCore::RenderTableSection::rowLogicalHeightChanged
BUG=108918
Review URL: https://chromiumcodereview.appspot.com/9214019
[email protected]
Review URL: https://chromiumcodereview.appspot.com/9271032
Modified Paths
Removed Paths
Diff
Deleted: branches/chromium/963/LayoutTests/fast/table/crash-section-logical-height-changed-needsCellRecalc-expected.txt (105823 => 105824)
--- branches/chromium/963/LayoutTests/fast/table/crash-section-logical-height-changed-needsCellRecalc-expected.txt 2012-01-24 23:34:39 UTC (rev 105823)
+++ branches/chromium/963/LayoutTests/fast/table/crash-section-logical-height-changed-needsCellRecalc-expected.txt 2012-01-24 23:37:47 UTC (rev 105824)
@@ -1,5 +0,0 @@
-Bug 76842: Crash in WebCore::RenderTableSection::rowLogicalHeightChanged
-
-This test passes if it does not crash nor ASSERT.
-
-
Deleted: branches/chromium/963/LayoutTests/fast/table/crash-section-logical-height-changed-needsCellRecalc.html (105823 => 105824)
--- branches/chromium/963/LayoutTests/fast/table/crash-section-logical-height-changed-needsCellRecalc.html 2012-01-24 23:34:39 UTC (rev 105823)
+++ branches/chromium/963/LayoutTests/fast/table/crash-section-logical-height-changed-needsCellRecalc.html 2012-01-24 23:37:47 UTC (rev 105824)
@@ -1,53 +0,0 @@
-<style>
-.c3 { position: fixed; }
-.c12:first-letter { visibility: inherit; }
-.c12 { -webkit-appearance: button; }
-.c13 { display: table-row; }
-.c13:nth-last-child(odd) { height: 80%; }
-</style>
-<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
-function boom() {
- var quote = document.createElement('q');
- document.documentElement.appendChild(quote);
-
- base = document.createElement('base');
- base2 = document.createElement('base');
- base2.setAttribute('class', 'c3');
- quote.appendChild(base2);
-
- var ins = document.createElement('ins');
- base2.appendChild(ins);
-
- var sub = document.createElement('sub');
- var quote3 = document.createElement('q');
- quote3.setAttribute('class', 'c12');
- sub.appendChild(quote3);
-
- figureRow = document.createElement('figure');
- figureRow.setAttribute('class', 'c13');
- document.documentElement.appendChild(figureRow);
-
- var col = document.createElement('col');
- col.setAttribute('class', 'c13');
- document.documentElement.appendChild(col);
-
- var select = document.createElement('select');
- document.documentElement.appendChild(select);
-
- code = document.createElement('code');
- document.documentElement.appendChild(code);
-
- quote2 = document.createElement('q');
- setTimeout('quote2.appendChild(code);', 321);
- ins.appendChild(sub);
- setTimeout('base.appendChild(figureRow);', 251);
- text = document.createTextNode('-1435037881');
- setTimeout('figureRow.appendChild(text);', 206);
-}
-window._onload_ = boom;
-</script>
-<p>Bug <a href="" Crash in WebCore::RenderTableSection::rowLogicalHeightChanged</p>
-<p>This test passes if it does not crash nor ASSERT.</p>
Modified: branches/chromium/963/Source/WebCore/rendering/RenderTableSection.cpp (105823 => 105824)
--- branches/chromium/963/Source/WebCore/rendering/RenderTableSection.cpp 2012-01-24 23:34:39 UTC (rev 105823)
+++ branches/chromium/963/Source/WebCore/rendering/RenderTableSection.cpp 2012-01-24 23:37:47 UTC (rev 105824)
@@ -1155,22 +1155,6 @@
setNeedsLayout(true);
}
-// FIXME: This function could be made O(1) in certain cases (like for the non-most-constrainive cells' case).
-void RenderTableSection::rowLogicalHeightChanged(unsigned rowIndex)
-{
- if (needsCellRecalc())
- return;
-
- setRowLogicalHeightToRowStyleLogicalHeightIfNotRelative(m_grid[rowIndex]);
-
- for (RenderObject* cell = m_grid[rowIndex].rowRenderer->firstChild(); cell; cell = cell->nextSibling()) {
- if (!cell->isTableCell())
- continue;
-
- updateLogicalHeightForCell(m_grid[rowIndex], toRenderTableCell(cell));
- }
-}
-
void RenderTableSection::setNeedsCellRecalc()
{
m_needsCellRecalc = true;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
