| 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 27 matching lines...) Expand all Loading... |
| 38 , m_shouldAssumeContentIsAlwaysEditable(shouldAssumeContentIsAlwaysEditable) | 38 , m_shouldAssumeContentIsAlwaysEditable(shouldAssumeContentIsAlwaysEditable) |
| 39 { | 39 { |
| 40 DCHECK(m_node); | 40 DCHECK(m_node); |
| 41 DCHECK(m_node->parentNode()); | 41 DCHECK(m_node->parentNode()); |
| 42 } | 42 } |
| 43 | 43 |
| 44 void RemoveNodeCommand::doApply(EditingState* editingState) | 44 void RemoveNodeCommand::doApply(EditingState* editingState) |
| 45 { | 45 { |
| 46 ContainerNode* parent = m_node->parentNode(); | 46 ContainerNode* parent = m_node->parentNode(); |
| 47 if (!parent || (m_shouldAssumeContentIsAlwaysEditable == DoNotAssumeContentI
sAlwaysEditable | 47 if (!parent || (m_shouldAssumeContentIsAlwaysEditable == DoNotAssumeContentI
sAlwaysEditable |
| 48 && !parent->isContentEditable() && parent->inActiveDocument())) | 48 && !isContentEditable(*parent) && parent->inActiveDocument())) |
| 49 return; | 49 return; |
| 50 DCHECK(parent->isContentEditable() || !parent->inActiveDocument()) << parent
; | 50 DCHECK(isContentEditable(*parent) || !parent->inActiveDocument()) << parent; |
| 51 | 51 |
| 52 m_parent = parent; | 52 m_parent = parent; |
| 53 m_refChild = m_node->nextSibling(); | 53 m_refChild = m_node->nextSibling(); |
| 54 | 54 |
| 55 m_node->remove(IGNORE_EXCEPTION); | 55 m_node->remove(IGNORE_EXCEPTION); |
| 56 // Node::remove dispatch synchronous events such as IFRAME unload events, | 56 // Node::remove dispatch synchronous events such as IFRAME unload events, |
| 57 // and event handlers may break the document. We check the document state | 57 // and event handlers may break the document. We check the document state |
| 58 // here in order to prevent further processing in bad situation. | 58 // here in order to prevent further processing in bad situation. |
| 59 ABORT_EDITING_COMMAND_IF(!m_node->document().frame()); | 59 ABORT_EDITING_COMMAND_IF(!m_node->document().frame()); |
| 60 ABORT_EDITING_COMMAND_IF(!m_node->document().documentElement()); | 60 ABORT_EDITING_COMMAND_IF(!m_node->document().documentElement()); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 72 | 72 |
| 73 DEFINE_TRACE(RemoveNodeCommand) | 73 DEFINE_TRACE(RemoveNodeCommand) |
| 74 { | 74 { |
| 75 visitor->trace(m_node); | 75 visitor->trace(m_node); |
| 76 visitor->trace(m_parent); | 76 visitor->trace(m_parent); |
| 77 visitor->trace(m_refChild); | 77 visitor->trace(m_refChild); |
| 78 SimpleEditCommand::trace(visitor); | 78 SimpleEditCommand::trace(visitor); |
| 79 } | 79 } |
| 80 | 80 |
| 81 } // namespace blink | 81 } // namespace blink |
| OLD | NEW |