Title: [92927] branches/safari-534.51-branch
- Revision
- 92927
- Author
- [email protected]
- Date
- 2011-08-11 22:27:26 -0700 (Thu, 11 Aug 2011)
Log Message
Merge r91270.
Modified Paths
Added Paths
Diff
Modified: branches/safari-534.51-branch/LayoutTests/ChangeLog (92926 => 92927)
--- branches/safari-534.51-branch/LayoutTests/ChangeLog 2011-08-12 05:25:33 UTC (rev 92926)
+++ branches/safari-534.51-branch/LayoutTests/ChangeLog 2011-08-12 05:27:26 UTC (rev 92927)
@@ -1,5 +1,20 @@
2011-08-11 Lucas Forschler <[email protected]>
+ Merged 91270
+
+ 2011-07-19 Abhishek Arya <[email protected]>
+
+ Tests that we do not crash when removing unrendering nodes
+ in a replacement fragment.
+ https://bugs.webkit.org/show_bug.cgi?id=64801
+
+ Reviewed by Ryosuke Niwa.
+
+ * editing/pasteboard/replacement-fragment-remove-unrendered-node-crash-expected.txt: Added.
+ * editing/pasteboard/replacement-fragment-remove-unrendered-node-crash.html: Added.
+
+2011-08-11 Lucas Forschler <[email protected]>
+
Merged 91152
2011-07-16 Sergey Glazunov <[email protected]>
Copied: branches/safari-534.51-branch/LayoutTests/editing/pasteboard/replacement-fragment-remove-unrendered-node-crash-expected.txt (from rev 91270, trunk/LayoutTests/editing/pasteboard/replacement-fragment-remove-unrendered-node-crash-expected.txt) (0 => 92927)
--- branches/safari-534.51-branch/LayoutTests/editing/pasteboard/replacement-fragment-remove-unrendered-node-crash-expected.txt (rev 0)
+++ branches/safari-534.51-branch/LayoutTests/editing/pasteboard/replacement-fragment-remove-unrendered-node-crash-expected.txt 2011-08-12 05:27:26 UTC (rev 92927)
@@ -0,0 +1 @@
+Test passes if it does not crash.
Copied: branches/safari-534.51-branch/LayoutTests/editing/pasteboard/replacement-fragment-remove-unrendered-node-crash.html (from rev 91270, trunk/LayoutTests/editing/pasteboard/replacement-fragment-remove-unrendered-node-crash.html) (0 => 92927)
--- branches/safari-534.51-branch/LayoutTests/editing/pasteboard/replacement-fragment-remove-unrendered-node-crash.html (rev 0)
+++ branches/safari-534.51-branch/LayoutTests/editing/pasteboard/replacement-fragment-remove-unrendered-node-crash.html 2011-08-12 05:27:26 UTC (rev 92927)
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+Test passes if it does not crash.
+<input id="test" contenteditable="true">
+<script src=""
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+var e = document.getElementById("test");
+var s = window.getSelection();
+
+s.setPosition(e, 10500000000);
+insertHTMLCommand("<noscript>baz");
+</script>
+</html>
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (92926 => 92927)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-12 05:25:33 UTC (rev 92926)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-12 05:27:26 UTC (rev 92927)
@@ -1,5 +1,21 @@
2011-08-11 Lucas Forschler <[email protected]>
+ Merged 91270
+
+ 2011-07-19 Abhishek Arya <[email protected]>
+
+ Crash when removing unrenderered nodes in replacement fragment.
+ https://bugs.webkit.org/show_bug.cgi?id=64801
+
+ Reviewed by Ryosuke Niwa.
+
+ Test: editing/pasteboard/replacement-fragment-remove-unrendered-node-crash.html
+
+ * editing/ReplaceSelectionCommand.cpp:
+ (WebCore::ReplacementFragment::removeUnrenderedNodes):
+
+2011-08-11 Lucas Forschler <[email protected]>
+
Merged 91152
2011-07-16 Sergey Glazunov <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/editing/ReplaceSelectionCommand.cpp (92926 => 92927)
--- branches/safari-534.51-branch/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2011-08-12 05:25:33 UTC (rev 92926)
+++ branches/safari-534.51-branch/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2011-08-12 05:27:26 UTC (rev 92927)
@@ -288,7 +288,7 @@
void ReplacementFragment::removeUnrenderedNodes(Node* holder)
{
- Vector<Node*> unrendered;
+ Vector<RefPtr<Node> > unrendered;
for (Node* node = holder->firstChild(); node; node = node->traverseNextNode(holder))
if (!isNodeRendered(node) && !isTableStructureNode(node))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
