Title: [86894] branches/safari-534.36-branch
- Revision
- 86894
- Author
- [email protected]
- Date
- 2011-05-19 15:08:24 -0700 (Thu, 19 May 2011)
Log Message
Merge r86781.
Modified Paths
Added Paths
Diff
Modified: branches/safari-534.36-branch/LayoutTests/ChangeLog (86893 => 86894)
--- branches/safari-534.36-branch/LayoutTests/ChangeLog 2011-05-19 22:06:23 UTC (rev 86893)
+++ branches/safari-534.36-branch/LayoutTests/ChangeLog 2011-05-19 22:08:24 UTC (rev 86894)
@@ -1,5 +1,20 @@
2011-05-19 Lucas Forschler <[email protected]
+ Merged r86781.
+
+ 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-19 Lucas Forschler <[email protected]
+
Merged r86741.
2011-05-16 Jeremy Noble <[email protected]>
Copied: branches/safari-534.36-branch/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 => 86894)
--- branches/safari-534.36-branch/LayoutTests/fast/table/table-captions-child-visible-crash-expected.txt (rev 0)
+++ branches/safari-534.36-branch/LayoutTests/fast/table/table-captions-child-visible-crash-expected.txt 2011-05-19 22:08:24 UTC (rev 86894)
@@ -0,0 +1,2 @@
+Test passes if it does not crash.
+
Copied: branches/safari-534.36-branch/LayoutTests/fast/table/table-captions-child-visible-crash.html (from rev 86781, trunk/LayoutTests/fast/table/table-captions-child-visible-crash.html) (0 => 86894)
--- branches/safari-534.36-branch/LayoutTests/fast/table/table-captions-child-visible-crash.html (rev 0)
+++ branches/safari-534.36-branch/LayoutTests/fast/table/table-captions-child-visible-crash.html 2011-05-19 22:08:24 UTC (rev 86894)
@@ -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/safari-534.36-branch/Source/WebCore/ChangeLog (86893 => 86894)
--- branches/safari-534.36-branch/Source/WebCore/ChangeLog 2011-05-19 22:06:23 UTC (rev 86893)
+++ branches/safari-534.36-branch/Source/WebCore/ChangeLog 2011-05-19 22:08:24 UTC (rev 86894)
@@ -1,5 +1,22 @@
2011-05-19 Lucas Forschler <[email protected]
+ Merged r86781.
+
+ 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-19 Lucas Forschler <[email protected]
+
Merged r86741.
2011-05-16 Jeremy Noble <[email protected]>
Modified: branches/safari-534.36-branch/Source/WebCore/rendering/RenderTable.cpp (86893 => 86894)
--- branches/safari-534.36-branch/Source/WebCore/rendering/RenderTable.cpp 2011-05-19 22:06:23 UTC (rev 86893)
+++ branches/safari-534.36-branch/Source/WebCore/rendering/RenderTable.cpp 2011-05-19 22:08:24 UTC (rev 86894)
@@ -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
