| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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(Node::UserSelectAllIsAlwaysNonEditable) &&
parent->attached())) | 48 && !parent->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable) &&
parent->attached())) |
| 49 return; | 49 return; |
| 50 ASSERT(parent->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable) ||
!parent->attached()); | 50 ASSERT(parent->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable) ||
!parent->attached()); |
| 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_STATE); | 55 m_node->remove(IGNORE_EXCEPTION); |
| 56 } | 56 } |
| 57 | 57 |
| 58 void RemoveNodeCommand::doUnapply() | 58 void RemoveNodeCommand::doUnapply() |
| 59 { | 59 { |
| 60 RefPtr<ContainerNode> parent = m_parent.release(); | 60 RefPtr<ContainerNode> parent = m_parent.release(); |
| 61 RefPtr<Node> refChild = m_refChild.release(); | 61 RefPtr<Node> refChild = m_refChild.release(); |
| 62 if (!parent || !parent->rendererIsEditable()) | 62 if (!parent || !parent->rendererIsEditable()) |
| 63 return; | 63 return; |
| 64 | 64 |
| 65 parent->insertBefore(m_node.get(), refChild.get(), IGNORE_EXCEPTION_STATE); | 65 parent->insertBefore(m_node.get(), refChild.get(), IGNORE_EXCEPTION); |
| 66 } | 66 } |
| 67 | 67 |
| 68 #ifndef NDEBUG | 68 #ifndef NDEBUG |
| 69 void RemoveNodeCommand::getNodesInCommand(HashSet<Node*>& nodes) | 69 void RemoveNodeCommand::getNodesInCommand(HashSet<Node*>& nodes) |
| 70 { | 70 { |
| 71 addNodeAndDescendants(m_parent.get(), nodes); | 71 addNodeAndDescendants(m_parent.get(), nodes); |
| 72 addNodeAndDescendants(m_refChild.get(), nodes); | 72 addNodeAndDescendants(m_refChild.get(), nodes); |
| 73 addNodeAndDescendants(m_node.get(), nodes); | 73 addNodeAndDescendants(m_node.get(), nodes); |
| 74 } | 74 } |
| 75 #endif | 75 #endif |
| 76 | 76 |
| 77 } | 77 } |
| OLD | NEW |