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

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

Issue 435733002: Have getChildNodes() take a ContainerNode in argument (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 m_element1 = m_element2->cloneElementWithoutChildren(); 75 m_element1 = m_element2->cloneElementWithoutChildren();
76 76
77 executeApply(); 77 executeApply();
78 } 78 }
79 79
80 void SplitElementCommand::doUnapply() 80 void SplitElementCommand::doUnapply()
81 { 81 {
82 if (!m_element1 || !m_element1->hasEditableStyle() || !m_element2->hasEditab leStyle()) 82 if (!m_element1 || !m_element1->hasEditableStyle() || !m_element2->hasEditab leStyle())
83 return; 83 return;
84 84
85 WillBeHeapVector<RefPtrWillBeMember<Node> > children; 85 NodeVector children;
86 for (Node* node = m_element1->firstChild(); node; node = node->nextSibling() ) 86 getChildNodes(*m_element1, children);
87 children.append(node);
88 87
89 RefPtrWillBeRawPtr<Node> refChild = m_element2->firstChild(); 88 RefPtrWillBeRawPtr<Node> refChild = m_element2->firstChild();
90 89
91 size_t size = children.size(); 90 size_t size = children.size();
92 for (size_t i = 0; i < size; ++i) 91 for (size_t i = 0; i < size; ++i)
93 m_element2->insertBefore(children[i].get(), refChild.get(), IGNORE_EXCEP TION); 92 m_element2->insertBefore(children[i].get(), refChild.get(), IGNORE_EXCEP TION);
94 93
95 // Recover the id attribute of the original element. 94 // Recover the id attribute of the original element.
96 const AtomicString& id = m_element1->getAttribute(HTMLNames::idAttr); 95 const AtomicString& id = m_element1->getAttribute(HTMLNames::idAttr);
97 if (!id.isNull()) 96 if (!id.isNull())
(...skipping 12 matching lines...) Expand all
110 109
111 void SplitElementCommand::trace(Visitor* visitor) 110 void SplitElementCommand::trace(Visitor* visitor)
112 { 111 {
113 visitor->trace(m_element1); 112 visitor->trace(m_element1);
114 visitor->trace(m_element2); 113 visitor->trace(m_element2);
115 visitor->trace(m_atChild); 114 visitor->trace(m_atChild);
116 SimpleEditCommand::trace(visitor); 115 SimpleEditCommand::trace(visitor);
117 } 116 }
118 117
119 } // namespace blink 118 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698