diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/editing/RemoveNodePreservingChildrenCommand.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/editing/RemoveNodePreservingChildrenCommand.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/chromium/third_party/WebKit/Source/core/editing/RemoveNodePreservingChildrenCommand.cpp b/chromium/third_party/WebKit/Source/core/editing/RemoveNodePreservingChildrenCommand.cpp index 977f3cc637e..e5c992114cd 100644 --- a/chromium/third_party/WebKit/Source/core/editing/RemoveNodePreservingChildrenCommand.cpp +++ b/chromium/third_party/WebKit/Source/core/editing/RemoveNodePreservingChildrenCommand.cpp @@ -31,7 +31,7 @@ namespace WebCore { -RemoveNodePreservingChildrenCommand::RemoveNodePreservingChildrenCommand(PassRefPtr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable) +RemoveNodePreservingChildrenCommand::RemoveNodePreservingChildrenCommand(PassRefPtrWillBeRawPtr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable) : CompositeEditCommand(node->document()) , m_node(node) , m_shouldAssumeContentIsAlwaysEditable(shouldAssumeContentIsAlwaysEditable) @@ -41,17 +41,23 @@ RemoveNodePreservingChildrenCommand::RemoveNodePreservingChildrenCommand(PassRef void RemoveNodePreservingChildrenCommand::doApply() { - Vector<RefPtr<Node> > children; + WillBeHeapVector<RefPtrWillBeMember<Node> > children; for (Node* child = m_node->firstChild(); child; child = child->nextSibling()) children.append(child); size_t size = children.size(); for (size_t i = 0; i < size; ++i) { - RefPtr<Node> child = children[i].release(); + RefPtrWillBeRawPtr<Node> child = children[i].release(); removeNode(child, m_shouldAssumeContentIsAlwaysEditable); insertNodeBefore(child.release(), m_node, m_shouldAssumeContentIsAlwaysEditable); } removeNode(m_node, m_shouldAssumeContentIsAlwaysEditable); } +void RemoveNodePreservingChildrenCommand::trace(Visitor* visitor) +{ + visitor->trace(m_node); + CompositeEditCommand::trace(visitor); +} + } |