Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Unified Diff: Source/WebCore/dom/Node.cpp

Issue 10914322: Merge 127534 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/dom/ContainerNodeAlgorithms.cpp ('k') | Source/WebCore/html/HTMLFrameElementBase.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/dom/Node.cpp
===================================================================
--- Source/WebCore/dom/Node.cpp (revision 128789)
+++ Source/WebCore/dom/Node.cpp (working copy)
@@ -40,6 +40,7 @@
#include "CSSStyleSheet.h"
#include "ChildNodeList.h"
#include "ClassNodeList.h"
+#include "ContainerNodeAlgorithms.h"
#include "ContextMenuController.h"
#include "DOMImplementation.h"
#include "DOMSettableTokenList.h"
@@ -1199,6 +1200,11 @@
ec = HIERARCHY_REQUEST_ERR;
return;
}
+
+ if (newParent->inDocument() && ChildFrameDisconnector::nodeHasDisconnector(newParent)) {
+ ec = NO_MODIFICATION_ALLOWED_ERR;
+ return;
+ }
}
void Node::checkReplaceChild(Node* newChild, Node* oldChild, ExceptionCode& ec)
« no previous file with comments | « Source/WebCore/dom/ContainerNodeAlgorithms.cpp ('k') | Source/WebCore/html/HTMLFrameElementBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698