| 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 10 matching lines...) Expand all Loading... |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "core/editing/commands/MergeIdenticalElementsCommand.h" | 26 #include "core/editing/commands/MergeIdenticalElementsCommand.h" |
| 27 | 27 |
| 28 #include "bindings/core/v8/ExceptionState.h" | 28 #include "bindings/core/v8/ExceptionState.h" |
| 29 #include "bindings/core/v8/ExceptionStatePlaceholder.h" | 29 #include "bindings/core/v8/ExceptionStatePlaceholder.h" |
| 30 #include "core/dom/Element.h" | 30 #include "core/dom/Element.h" |
| 31 #include "core/editing/EditingUtilities.h" |
| 31 | 32 |
| 32 namespace blink { | 33 namespace blink { |
| 33 | 34 |
| 34 MergeIdenticalElementsCommand::MergeIdenticalElementsCommand(Element* first, Ele
ment* second) | 35 MergeIdenticalElementsCommand::MergeIdenticalElementsCommand(Element* first, Ele
ment* second) |
| 35 : SimpleEditCommand(first->document()) | 36 : SimpleEditCommand(first->document()) |
| 36 , m_element1(first) | 37 , m_element1(first) |
| 37 , m_element2(second) | 38 , m_element2(second) |
| 38 { | 39 { |
| 39 DCHECK(m_element1); | 40 DCHECK(m_element1); |
| 40 DCHECK(m_element2); | 41 DCHECK(m_element2); |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 85 |
| 85 DEFINE_TRACE(MergeIdenticalElementsCommand) | 86 DEFINE_TRACE(MergeIdenticalElementsCommand) |
| 86 { | 87 { |
| 87 visitor->trace(m_element1); | 88 visitor->trace(m_element1); |
| 88 visitor->trace(m_element2); | 89 visitor->trace(m_element2); |
| 89 visitor->trace(m_atChild); | 90 visitor->trace(m_atChild); |
| 90 SimpleEditCommand::trace(visitor); | 91 SimpleEditCommand::trace(visitor); |
| 91 } | 92 } |
| 92 | 93 |
| 93 } // namespace blink | 94 } // namespace blink |
| OLD | NEW |