Merge 63865 - 2010-07-21 Justin Schuh <jschuh@chromium.org>...

WebCore/dom/ContainerNode.cpp

Index: WebCore/dom/ContainerNode.cpp
===================================================================
--- WebCore/dom/ContainerNode.cpp	(revision 55439)
+++ WebCore/dom/ContainerNode.cpp	(working copy)
@@ -675,12 +675,13 @@
 void ContainerNode::cloneChildNodes(ContainerNode *clone)
 {
     // disable the delete button so it's elements are not serialized into the markup
-    if (document()->frame())
+    bool isEditorEnabled = document()->frame() && document()->frame()->editor()->canEdit();
+    if (isEditorEnabled)
         document()->frame()->editor()->deleteButtonController()->disable();
     ExceptionCode ec = 0;
     for (Node* n = firstChild(); n && !ec; n = n->nextSibling())
         clone->appendChild(n->cloneNode(true), ec);
-    if (document()->frame())
+    if (isEditorEnabled && document()->frame())
         document()->frame()->editor()->deleteButtonController()->enable();
 }