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

Unified Diff: Source/WebCore/editing/markup.cpp

Issue 9569046: Merge 109362 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 10 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/Text.cpp ('k') | Source/WebCore/html/HTMLElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/editing/markup.cpp
===================================================================
--- Source/WebCore/editing/markup.cpp (revision 109461)
+++ Source/WebCore/editing/markup.cpp (working copy)
@@ -692,7 +692,7 @@
static void trimFragment(DocumentFragment* fragment, Node* nodeBeforeContext, Node* nodeAfterContext)
{
ExceptionCode ec = 0;
- Node* next;
+ RefPtr<Node> next;
for (RefPtr<Node> node = fragment->firstChild(); node; node = next) {
if (nodeBeforeContext->isDescendantOf(node.get())) {
next = node->traverseNextNode();
@@ -706,9 +706,9 @@
}
ASSERT(nodeAfterContext->parentNode());
- for (Node* node = nodeAfterContext; node; node = next) {
+ for (RefPtr<Node> node = nodeAfterContext; node; node = next) {
next = node->traverseNextSibling();
- node->parentNode()->removeChild(node, ec);
+ node->parentNode()->removeChild(node.get(), ec);
ASSERT(!ec);
}
}
« no previous file with comments | « Source/WebCore/dom/Text.cpp ('k') | Source/WebCore/html/HTMLElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698