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

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

Issue 309283002: Oilpan: convert remaining editing/ RefPtr<Node>s to transition types. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 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
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 ASSERT(m_element2); 42 ASSERT(m_element2);
43 ASSERT(m_atChild); 43 ASSERT(m_atChild);
44 ASSERT(m_atChild->parentNode() == m_element2); 44 ASSERT(m_atChild->parentNode() == m_element2);
45 } 45 }
46 46
47 void SplitElementCommand::executeApply() 47 void SplitElementCommand::executeApply()
48 { 48 {
49 if (m_atChild->parentNode() != m_element2) 49 if (m_atChild->parentNode() != m_element2)
50 return; 50 return;
51 51
52 Vector<RefPtr<Node> > children; 52 WillBeHeapVector<RefPtrWillBeMember<Node> > children;
53 for (Node* node = m_element2->firstChild(); node != m_atChild; node = node-> nextSibling()) 53 for (Node* node = m_element2->firstChild(); node != m_atChild; node = node-> nextSibling())
54 children.append(node); 54 children.append(node);
55 55
56 TrackExceptionState exceptionState; 56 TrackExceptionState exceptionState;
57 57
58 ContainerNode* parent = m_element2->parentNode(); 58 ContainerNode* parent = m_element2->parentNode();
59 if (!parent || !parent->rendererIsEditable()) 59 if (!parent || !parent->rendererIsEditable())
60 return; 60 return;
61 parent->insertBefore(m_element1.get(), m_element2.get(), exceptionState); 61 parent->insertBefore(m_element1.get(), m_element2.get(), exceptionState);
62 if (exceptionState.hadException()) 62 if (exceptionState.hadException())
(...skipping 12 matching lines...) Expand all
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->rendererIsEditable() || !m_element2->rendere rIsEditable()) 82 if (!m_element1 || !m_element1->rendererIsEditable() || !m_element2->rendere rIsEditable())
83 return; 83 return;
84 84
85 Vector<RefPtr<Node> > children; 85 WillBeHeapVector<RefPtrWillBeMember<Node> > children;
86 for (Node* node = m_element1->firstChild(); node; node = node->nextSibling() ) 86 for (Node* node = m_element1->firstChild(); node; node = node->nextSibling() )
87 children.append(node); 87 children.append(node);
88 88
89 RefPtr<Node> refChild = m_element2->firstChild(); 89 RefPtrWillBeRawPtr<Node> refChild = m_element2->firstChild();
90 90
91 size_t size = children.size(); 91 size_t size = children.size();
92 for (size_t i = 0; i < size; ++i) 92 for (size_t i = 0; i < size; ++i)
93 m_element2->insertBefore(children[i].get(), refChild.get(), IGNORE_EXCEP TION); 93 m_element2->insertBefore(children[i].get(), refChild.get(), IGNORE_EXCEP TION);
94 94
95 // Recover the id attribute of the original element. 95 // Recover the id attribute of the original element.
96 const AtomicString& id = m_element1->getAttribute(HTMLNames::idAttr); 96 const AtomicString& id = m_element1->getAttribute(HTMLNames::idAttr);
97 if (!id.isNull()) 97 if (!id.isNull())
98 m_element2->setAttribute(HTMLNames::idAttr, id); 98 m_element2->setAttribute(HTMLNames::idAttr, id);
99 99
(...skipping 10 matching lines...) Expand all
110 110
111 void SplitElementCommand::trace(Visitor* visitor) 111 void SplitElementCommand::trace(Visitor* visitor)
112 { 112 {
113 visitor->trace(m_element1); 113 visitor->trace(m_element1);
114 visitor->trace(m_element2); 114 visitor->trace(m_element2);
115 visitor->trace(m_atChild); 115 visitor->trace(m_atChild);
116 SimpleEditCommand::trace(visitor); 116 SimpleEditCommand::trace(visitor);
117 } 117 }
118 118
119 } // namespace WebCore 119 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/editing/MergeIdenticalElementsCommand.cpp ('k') | Source/core/editing/WrapContentsInDummySpanCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698