| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2005, 2006, 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 20 matching lines...) Expand all Loading... |
| 31 | 31 |
| 32 AppendNodeCommand::AppendNodeCommand(ContainerNode* parent, Node* node) | 32 AppendNodeCommand::AppendNodeCommand(ContainerNode* parent, Node* node) |
| 33 : SimpleEditCommand(parent->document()) | 33 : SimpleEditCommand(parent->document()) |
| 34 , m_parent(parent) | 34 , m_parent(parent) |
| 35 , m_node(node) | 35 , m_node(node) |
| 36 { | 36 { |
| 37 DCHECK(m_parent); | 37 DCHECK(m_parent); |
| 38 DCHECK(m_node); | 38 DCHECK(m_node); |
| 39 DCHECK(!m_node->parentNode()) << m_node; | 39 DCHECK(!m_node->parentNode()) << m_node; |
| 40 | 40 |
| 41 DCHECK(m_parent->hasEditableStyle() || !m_parent->inActiveDocument()) << m_p
arent; | 41 DCHECK(hasEditableStyle(*m_parent) || !m_parent->inActiveDocument()) << m_pa
rent; |
| 42 } | 42 } |
| 43 | 43 |
| 44 void AppendNodeCommand::doApply(EditingState*) | 44 void AppendNodeCommand::doApply(EditingState*) |
| 45 { | 45 { |
| 46 if (!m_parent->hasEditableStyle() && m_parent->inActiveDocument()) | 46 if (!hasEditableStyle(*m_parent) && m_parent->inActiveDocument()) |
| 47 return; | 47 return; |
| 48 | 48 |
| 49 m_parent->appendChild(m_node.get(), IGNORE_EXCEPTION); | 49 m_parent->appendChild(m_node.get(), IGNORE_EXCEPTION); |
| 50 } | 50 } |
| 51 | 51 |
| 52 void AppendNodeCommand::doUnapply() | 52 void AppendNodeCommand::doUnapply() |
| 53 { | 53 { |
| 54 if (!m_parent->hasEditableStyle()) | 54 if (!hasEditableStyle(*m_parent)) |
| 55 return; | 55 return; |
| 56 | 56 |
| 57 m_node->remove(IGNORE_EXCEPTION); | 57 m_node->remove(IGNORE_EXCEPTION); |
| 58 } | 58 } |
| 59 | 59 |
| 60 DEFINE_TRACE(AppendNodeCommand) | 60 DEFINE_TRACE(AppendNodeCommand) |
| 61 { | 61 { |
| 62 visitor->trace(m_parent); | 62 visitor->trace(m_parent); |
| 63 visitor->trace(m_node); | 63 visitor->trace(m_node); |
| 64 SimpleEditCommand::trace(visitor); | 64 SimpleEditCommand::trace(visitor); |
| 65 } | 65 } |
| 66 | 66 |
| 67 } // namespace blink | 67 } // namespace blink |
| OLD | NEW |