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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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); |
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 const AtomicString& id = m_element1->getAttribute(HTMLNames::idAttr); |
97 m_element2->setAttribute(HTMLNames::idAttr, m_element1->getAttribute(HTM
LNames::idAttr)); | 97 if (!id.isNull()) |
| 98 m_element2->setAttribute(HTMLNames::idAttr, id); |
98 | 99 |
99 m_element1->remove(IGNORE_EXCEPTION); | 100 m_element1->remove(IGNORE_EXCEPTION); |
100 } | 101 } |
101 | 102 |
102 void SplitElementCommand::doReapply() | 103 void SplitElementCommand::doReapply() |
103 { | 104 { |
104 if (!m_element1) | 105 if (!m_element1) |
105 return; | 106 return; |
106 | 107 |
107 executeApply(); | 108 executeApply(); |
108 } | 109 } |
109 | 110 |
110 } // namespace WebCore | 111 } // namespace WebCore |
OLD | NEW |