OLD | NEW |
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 23 matching lines...) Expand all Loading... |
34 RemoveNodePreservingChildrenCommand::RemoveNodePreservingChildrenCommand(PassRef
PtrWillBeRawPtr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeCont
entIsAlwaysEditable) | 34 RemoveNodePreservingChildrenCommand::RemoveNodePreservingChildrenCommand(PassRef
PtrWillBeRawPtr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeCont
entIsAlwaysEditable) |
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 WillBeHeapVector<RefPtrWillBeMember<Node> > children; | 44 if (m_node->isContainerNode()) { |
45 for (Node* child = m_node->firstChild(); child; child = child->nextSibling()
) | 45 NodeVector children; |
46 children.append(child); | 46 getChildNodes(toContainerNode(*m_node), children); |
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 RefPtrWillBeRawPtr<Node> child = children[i].release(); | 50 RefPtrWillBeRawPtr<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_shouldAssumeContentIsAlw
aysEditable); |
| 53 } |
53 } | 54 } |
54 removeNode(m_node, m_shouldAssumeContentIsAlwaysEditable); | 55 removeNode(m_node, m_shouldAssumeContentIsAlwaysEditable); |
55 } | 56 } |
56 | 57 |
57 void RemoveNodePreservingChildrenCommand::trace(Visitor* visitor) | 58 void RemoveNodePreservingChildrenCommand::trace(Visitor* visitor) |
58 { | 59 { |
59 visitor->trace(m_node); | 60 visitor->trace(m_node); |
60 CompositeEditCommand::trace(visitor); | 61 CompositeEditCommand::trace(visitor); |
61 } | 62 } |
62 | 63 |
63 } | 64 } |
OLD | NEW |