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

Side by Side Diff: Source/core/editing/RemoveNodePreservingChildrenCommand.cpp

Issue 23819007: Have Node::document() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2005, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 14 matching lines...) Expand all
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/editing/RemoveNodePreservingChildrenCommand.h" 27 #include "core/editing/RemoveNodePreservingChildrenCommand.h"
28 28
29 #include "core/dom/Node.h" 29 #include "core/dom/Node.h"
30 #include "wtf/Assertions.h" 30 #include "wtf/Assertions.h"
31 31
32 namespace WebCore { 32 namespace WebCore {
33 33
34 RemoveNodePreservingChildrenCommand::RemoveNodePreservingChildrenCommand(PassRef Ptr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysE ditable) 34 RemoveNodePreservingChildrenCommand::RemoveNodePreservingChildrenCommand(PassRef Ptr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysE ditable)
35 : CompositeEditCommand(node->document()) 35 : CompositeEditCommand(&node->document())
36 , m_node(node) 36 , m_node(node)
37 , m_shouldAssumeContentIsAlwaysEditable(shouldAssumeContentIsAlwaysEditable) 37 , m_shouldAssumeContentIsAlwaysEditable(shouldAssumeContentIsAlwaysEditable)
38 { 38 {
39 ASSERT(m_node); 39 ASSERT(m_node);
40 } 40 }
41 41
42 void RemoveNodePreservingChildrenCommand::doApply() 42 void RemoveNodePreservingChildrenCommand::doApply()
43 { 43 {
44 Vector<RefPtr<Node> > children; 44 Vector<RefPtr<Node> > children;
45 for (Node* child = m_node->firstChild(); child; child = child->nextSibling() ) 45 for (Node* child = m_node->firstChild(); child; child = child->nextSibling() )
46 children.append(child); 46 children.append(child);
47 47
48 size_t size = children.size(); 48 size_t size = children.size();
49 for (size_t i = 0; i < size; ++i) { 49 for (size_t i = 0; i < size; ++i) {
50 RefPtr<Node> child = children[i].release(); 50 RefPtr<Node> child = children[i].release();
51 removeNode(child, m_shouldAssumeContentIsAlwaysEditable); 51 removeNode(child, m_shouldAssumeContentIsAlwaysEditable);
52 insertNodeBefore(child.release(), m_node, m_shouldAssumeContentIsAlwaysE ditable); 52 insertNodeBefore(child.release(), m_node, m_shouldAssumeContentIsAlwaysE ditable);
53 } 53 }
54 removeNode(m_node, m_shouldAssumeContentIsAlwaysEditable); 54 removeNode(m_node, m_shouldAssumeContentIsAlwaysEditable);
55 } 55 }
56 56
57 } 57 }
OLDNEW
« no previous file with comments | « Source/core/editing/RemoveNodeCommand.cpp ('k') | Source/core/editing/ReplaceNodeWithSpanCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698