| 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 NodeVector children; | 85 NodeVector children; |
| 86 getChildNodes(*m_element1, children); | 86 appendChildNodes(*m_element1, children); |
| 87 | 87 |
| 88 RefPtr<Node> refChild = m_element2->firstChild(); | 88 RefPtr<Node> refChild = m_element2->firstChild(); |
| 89 | 89 |
| 90 size_t size = children.size(); | 90 size_t size = children.size(); |
| 91 for (size_t i = 0; i < size; ++i) | 91 for (size_t i = 0; i < size; ++i) |
| 92 m_element2->insertBefore(children[i].get(), refChild.get(), IGNORE_EXCEP
TION); | 92 m_element2->insertBefore(children[i].get(), refChild.get(), IGNORE_EXCEP
TION); |
| 93 | 93 |
| 94 // Recover the id attribute of the original element. | 94 // Recover the id attribute of the original element. |
| 95 const AtomicString& id = m_element1->getAttribute(HTMLNames::idAttr); | 95 const AtomicString& id = m_element1->getAttribute(HTMLNames::idAttr); |
| 96 if (!id.isNull()) | 96 if (!id.isNull()) |
| 97 m_element2->setAttribute(HTMLNames::idAttr, id); | 97 m_element2->setAttribute(HTMLNames::idAttr, id); |
| 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 } // namespace blink | 110 } // namespace blink |
| OLD | NEW |