| 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 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_STATE); | 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     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_STATE); | 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 | 
| OLD | NEW | 
|---|