Changeset 107343 in webkit

Timestamp:

Feb 9, 2012, 6:47:04 PM (15 years ago)

Author:

cevans@google.com

Message:

Merge 106972
BUG=112093
Review URL: ​https://chromiumcodereview.appspot.com/9371041

Location:

branches/chromium/1025

Files:

• LayoutTests/fast/dom/remove-body-during-body-replacement-expected.txt (copied) (copied from trunk/LayoutTests/fast/dom/remove-body-during-body-replacement-expected.txt )
• LayoutTests/fast/dom/remove-body-during-body-replacement.html (copied) (copied from trunk/LayoutTests/fast/dom/remove-body-during-body-replacement.html )
• LayoutTests/fast/dom/remove-body-during-body-replacement2-expected.txt (copied) (copied from trunk/LayoutTests/fast/dom/remove-body-during-body-replacement2-expected.txt )
• LayoutTests/fast/dom/remove-body-during-body-replacement2.html (copied) (copied from trunk/LayoutTests/fast/dom/remove-body-during-body-replacement2.html )
• Source/WebCore/dom/ContainerNode.cpp (modified) (4 diffs)

branches/chromium/1025/Source/WebCore/dom/ContainerNode.cpp

@@ -117 +117 @@
     ASSERT(refCount() || parentOrHostNode());
 
+    RefPtr<Node> protect(this);
+
     ec = 0;
 
@@ -262 +264 @@
     ASSERT(refCount() || parentOrHostNode());
 
+    RefPtr<Node> protect(this);
+
     ec = 0;
 
@@ -428 +432 @@
     ASSERT(refCount() || parentOrHostNode());
 
+    RefPtr<Node> protect(this);
+
     ec = 0;
 
@@ -606 +612 @@
 bool ContainerNode::appendChild(PassRefPtr<Node> newChild, ExceptionCode& ec, bool shouldLazyAttach)
 {
-    RefPtr<ContainerNode> protector(this);
+    RefPtr<ContainerNode> protect(this);
 
     // Check that this node is not "floating".