| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 | 68 |
| 69 void SplitTextNodeCommand::doUnapply() | 69 void SplitTextNodeCommand::doUnapply() |
| 70 { | 70 { |
| 71 if (!m_text1 || !m_text1->hasEditableStyle()) | 71 if (!m_text1 || !m_text1->hasEditableStyle()) |
| 72 return; | 72 return; |
| 73 | 73 |
| 74 DCHECK_EQ(m_text1->document(), document()); | 74 DCHECK_EQ(m_text1->document(), document()); |
| 75 | 75 |
| 76 String prefixText = m_text1->data(); | 76 String prefixText = m_text1->data(); |
| 77 | 77 |
| 78 m_text2->insertData(0, prefixText, ASSERT_NO_EXCEPTION, CharacterData::Depre
catedRecalcStyleImmediatlelyForEditing); | 78 m_text2->insertData(0, prefixText, ASSERT_NO_EXCEPTION); |
| 79 document().updateStyleAndLayout(); |
| 79 | 80 |
| 80 document().markers().copyMarkers(m_text1.get(), 0, prefixText.length(), m_te
xt2.get(), 0); | 81 document().markers().copyMarkers(m_text1.get(), 0, prefixText.length(), m_te
xt2.get(), 0); |
| 81 m_text1->remove(ASSERT_NO_EXCEPTION); | 82 m_text1->remove(ASSERT_NO_EXCEPTION); |
| 82 } | 83 } |
| 83 | 84 |
| 84 void SplitTextNodeCommand::doReapply() | 85 void SplitTextNodeCommand::doReapply() |
| 85 { | 86 { |
| 86 if (!m_text1 || !m_text2) | 87 if (!m_text1 || !m_text2) |
| 87 return; | 88 return; |
| 88 | 89 |
| 89 ContainerNode* parent = m_text2->parentNode(); | 90 ContainerNode* parent = m_text2->parentNode(); |
| 90 if (!parent || !parent->hasEditableStyle()) | 91 if (!parent || !parent->hasEditableStyle()) |
| 91 return; | 92 return; |
| 92 | 93 |
| 93 insertText1AndTrimText2(); | 94 insertText1AndTrimText2(); |
| 94 } | 95 } |
| 95 | 96 |
| 96 void SplitTextNodeCommand::insertText1AndTrimText2() | 97 void SplitTextNodeCommand::insertText1AndTrimText2() |
| 97 { | 98 { |
| 98 TrackExceptionState exceptionState; | 99 TrackExceptionState exceptionState; |
| 99 m_text2->parentNode()->insertBefore(m_text1.get(), m_text2.get(), exceptionS
tate); | 100 m_text2->parentNode()->insertBefore(m_text1.get(), m_text2.get(), exceptionS
tate); |
| 100 if (exceptionState.hadException()) | 101 if (exceptionState.hadException()) |
| 101 return; | 102 return; |
| 102 m_text2->deleteData(0, m_offset, exceptionState, CharacterData::DeprecatedRe
calcStyleImmediatlelyForEditing); | 103 m_text2->deleteData(0, m_offset, exceptionState); |
| 104 document().updateStyleAndLayout(); |
| 103 } | 105 } |
| 104 | 106 |
| 105 DEFINE_TRACE(SplitTextNodeCommand) | 107 DEFINE_TRACE(SplitTextNodeCommand) |
| 106 { | 108 { |
| 107 visitor->trace(m_text1); | 109 visitor->trace(m_text1); |
| 108 visitor->trace(m_text2); | 110 visitor->trace(m_text2); |
| 109 SimpleEditCommand::trace(visitor); | 111 SimpleEditCommand::trace(visitor); |
| 110 } | 112 } |
| 111 | 113 |
| 112 } // namespace blink | 114 } // namespace blink |
| OLD | NEW |