Title: [86781] trunk
- Revision
- 86781
- Author
- [email protected]
- Date
- 2011-05-18 12:30:48 -0700 (Wed, 18 May 2011)
Log Message
2011-05-18 Abhishek Arya <[email protected]>
Reviewed by Beth Dakin.
Tests that we do not crash when prematurely calling removeChild,
followed by destroy call on table caption.
https://bugs.webkit.org/show_bug.cgi?id=61083
* fast/table/table-captions-child-visible-crash-expected.txt: Added.
* fast/table/table-captions-child-visible-crash.html: Added.
2011-05-18 Abhishek Arya <[email protected]>
Reviewed by Beth Dakin.
Remove removeChild on table caption since destroy call
already does that.
https://bugs.webkit.org/show_bug.cgi?id=61083
Test: fast/table/table-captions-child-visible-crash.html
* rendering/RenderTable.cpp:
(WebCore::RenderTable::recalcCaption):
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (86780 => 86781)
--- trunk/LayoutTests/ChangeLog 2011-05-18 18:42:16 UTC (rev 86780)
+++ trunk/LayoutTests/ChangeLog 2011-05-18 19:30:48 UTC (rev 86781)
@@ -1,3 +1,14 @@
+2011-05-18 Abhishek Arya <[email protected]>
+
+ Reviewed by Beth Dakin.
+
+ Tests that we do not crash when prematurely calling removeChild,
+ followed by destroy call on table caption.
+ https://bugs.webkit.org/show_bug.cgi?id=61083
+
+ * fast/table/table-captions-child-visible-crash-expected.txt: Added.
+ * fast/table/table-captions-child-visible-crash.html: Added.
+
2011-05-18 Chang Shu <[email protected]>
Reviewed by Csaba Osztrogonác.
Added: trunk/LayoutTests/fast/table/table-captions-child-visible-crash-expected.txt (0 => 86781)
--- trunk/LayoutTests/fast/table/table-captions-child-visible-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/table/table-captions-child-visible-crash-expected.txt 2011-05-18 19:30:48 UTC (rev 86781)
@@ -0,0 +1,2 @@
+Test passes if it does not crash.
+
Added: trunk/LayoutTests/fast/table/table-captions-child-visible-crash.html (0 => 86781)
--- trunk/LayoutTests/fast/table/table-captions-child-visible-crash.html (rev 0)
+++ trunk/LayoutTests/fast/table/table-captions-child-visible-crash.html 2011-05-18 19:30:48 UTC (rev 86781)
@@ -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: trunk/Source/WebCore/ChangeLog (86780 => 86781)
--- trunk/Source/WebCore/ChangeLog 2011-05-18 18:42:16 UTC (rev 86780)
+++ trunk/Source/WebCore/ChangeLog 2011-05-18 19:30:48 UTC (rev 86781)
@@ -1,3 +1,16 @@
+2011-05-18 Abhishek Arya <[email protected]>
+
+ Reviewed by Beth Dakin.
+
+ Remove removeChild on table caption since destroy call
+ already does that.
+ https://bugs.webkit.org/show_bug.cgi?id=61083
+
+ Test: fast/table/table-captions-child-visible-crash.html
+
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::recalcCaption):
+
2011-05-18 Evan Martin <[email protected]>
Reviewed by Tony Chang.
Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (86780 => 86781)
--- trunk/Source/WebCore/rendering/RenderTable.cpp 2011-05-18 18:42:16 UTC (rev 86780)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2011-05-18 19:30:48 UTC (rev 86781)
@@ -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
