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

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

Issue 22880029: Make AttachBehavior a required argument. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 Vector<RefPtr<Node> > children; 52 Vector<RefPtr<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 es; 56 TrackExceptionState es;
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(), es); 61 parent->insertBefore(m_element1.get(), m_element2.get(), es, DeprecatedAttac hNow);
62 if (es.hadException()) 62 if (es.hadException())
63 return; 63 return;
64 64
65 // Delete id attribute from the second element because the same id cannot be used for more than one element 65 // Delete id attribute from the second element because the same id cannot be used for more than one element
66 m_element2->removeAttribute(HTMLNames::idAttr); 66 m_element2->removeAttribute(HTMLNames::idAttr);
67 67
68 size_t size = children.size(); 68 size_t size = children.size();
69 for (size_t i = 0; i < size; ++i) 69 for (size_t i = 0; i < size; ++i)
70 m_element1->appendChild(children[i], es); 70 m_element1->appendChild(children[i], es, DeprecatedAttachNow);
71 } 71 }
72 72
73 void SplitElementCommand::doApply() 73 void SplitElementCommand::doApply()
74 { 74 {
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 Vector<RefPtr<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 RefPtr<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, DeprecatedAttachNow);
94 94
95 // Recover the id attribute of the original element. 95 // Recover the id attribute of the original element.
96 if (m_element1->hasAttribute(HTMLNames::idAttr)) 96 if (m_element1->hasAttribute(HTMLNames::idAttr))
97 m_element2->setAttribute(HTMLNames::idAttr, m_element1->getAttribute(HTM LNames::idAttr)); 97 m_element2->setAttribute(HTMLNames::idAttr, m_element1->getAttribute(HTM LNames::idAttr));
98 98
99 m_element1->remove(IGNORE_EXCEPTION); 99 m_element1->remove(IGNORE_EXCEPTION);
100 } 100 }
101 101
102 void SplitElementCommand::doReapply() 102 void SplitElementCommand::doReapply()
103 { 103 {
104 if (!m_element1) 104 if (!m_element1)
105 return; 105 return;
106 106
107 executeApply(); 107 executeApply();
108 } 108 }
109 109
110 #ifndef NDEBUG 110 #ifndef NDEBUG
111 void SplitElementCommand::getNodesInCommand(HashSet<Node*>& nodes) 111 void SplitElementCommand::getNodesInCommand(HashSet<Node*>& nodes)
112 { 112 {
113 addNodeAndDescendants(m_element1.get(), nodes); 113 addNodeAndDescendants(m_element1.get(), nodes);
114 addNodeAndDescendants(m_element2.get(), nodes); 114 addNodeAndDescendants(m_element2.get(), nodes);
115 addNodeAndDescendants(m_atChild.get(), nodes); 115 addNodeAndDescendants(m_atChild.get(), nodes);
116 } 116 }
117 #endif 117 #endif
118 118
119 } // namespace WebCore 119 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/editing/ReplaceSelectionCommand.cpp ('k') | Source/core/editing/SplitTextNodeCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698