Title: [86892] branches/chromium/742
- Revision
- 86892
- Author
- [email protected]
- Date
- 2011-05-19 15:06:23 -0700 (Thu, 19 May 2011)
Log Message
Merge 86781
BUG=79075
Review URL: http://codereview.chromium.org/7048016
Modified Paths
Added Paths
Diff
Copied: branches/chromium/742/LayoutTests/fast/table/table-captions-child-visible-crash-expected.txt (from rev 86781, trunk/LayoutTests/fast/table/table-captions-child-visible-crash-expected.txt) (0 => 86892)
--- branches/chromium/742/LayoutTests/fast/table/table-captions-child-visible-crash-expected.txt (rev 0)
+++ branches/chromium/742/LayoutTests/fast/table/table-captions-child-visible-crash-expected.txt 2011-05-19 22:06:23 UTC (rev 86892)
@@ -0,0 +1,2 @@
+Test passes if it does not crash.
+
Copied: branches/chromium/742/LayoutTests/fast/table/table-captions-child-visible-crash.html (from rev 86781, trunk/LayoutTests/fast/table/table-captions-child-visible-crash.html) (0 => 86892)
--- branches/chromium/742/LayoutTests/fast/table/table-captions-child-visible-crash.html (rev 0)
+++ branches/chromium/742/LayoutTests/fast/table/table-captions-child-visible-crash.html 2011-05-19 22:06:23 UTC (rev 86892)
@@ -0,0 +1,17 @@
+<html>
+ <body>
+ Test passes if it does not crash.
+ <div style="visibility: collapse;">
+ <table>
+ <caption></caption>
+ <caption>
+ <span style="visibility: visible;"></span>
+ </caption>
+ </table>
+ </div>
+ <script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ </script>
+ </body>
+</html>
Modified: branches/chromium/742/Source/WebCore/rendering/RenderTable.cpp (86891 => 86892)
--- branches/chromium/742/Source/WebCore/rendering/RenderTable.cpp 2011-05-19 22:05:01 UTC (rev 86891)
+++ branches/chromium/742/Source/WebCore/rendering/RenderTable.cpp 2011-05-19 22:06:23 UTC (rev 86892)
@@ -701,10 +701,6 @@
m_caption = caption;
m_caption->setNeedsLayout(true);
} else {
- // Detach the child from the table.
- const RenderBlock* block = static_cast<const RenderBlock*>(this);
- const_cast<RenderBlock*>(block)->removeChild(caption);
-
// Make sure to null out the child's renderer.
if (Node* node = caption->node())
node->setRenderer(0);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
