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

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

Issue 10987026: Merge 129469 - adoptNode() shouldn't reset ownerDocument if the source node failed to remove itself (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 | « LayoutTests/fast/dom/adopt-node-prevented-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/dom/Document.cpp
===================================================================
--- Source/WebCore/dom/Document.cpp (revision 129517)
+++ Source/WebCore/dom/Document.cpp (working copy)
@@ -1065,8 +1065,11 @@
return 0;
}
}
- if (source->parentNode())
+ if (source->parentNode()) {
source->parentNode()->removeChild(source.get(), ec);
+ if (ec)
+ return 0;
+ }
}
this->adoptIfNeeded(source.get());
« no previous file with comments | « LayoutTests/fast/dom/adopt-node-prevented-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698