| 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 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 "config.h" | 26 #include "config.h" |
| 27 #include "core/editing/AppendNodeCommand.h" | 27 #include "core/editing/AppendNodeCommand.h" |
| 28 | 28 |
| 29 #include "bindings/v8/ExceptionState.h" | 29 #include "bindings/v8/ExceptionState.h" |
| 30 #include "core/accessibility/AXObjectCache.h" | |
| 31 #include "core/dom/Document.h" | 30 #include "core/dom/Document.h" |
| 32 | 31 |
| 33 namespace WebCore { | 32 namespace WebCore { |
| 34 | 33 |
| 35 AppendNodeCommand::AppendNodeCommand(PassRefPtr<ContainerNode> parent, PassRefPt
r<Node> node) | 34 AppendNodeCommand::AppendNodeCommand(PassRefPtr<ContainerNode> parent, PassRefPt
r<Node> node) |
| 36 : SimpleEditCommand(parent->document()) | 35 : SimpleEditCommand(parent->document()) |
| 37 , m_parent(parent) | 36 , m_parent(parent) |
| 38 , m_node(node) | 37 , m_node(node) |
| 39 { | 38 { |
| 40 ASSERT(m_parent); | 39 ASSERT(m_parent); |
| 41 ASSERT(m_node); | 40 ASSERT(m_node); |
| 42 ASSERT(!m_node->parentNode()); | 41 ASSERT(!m_node->parentNode()); |
| 43 | 42 |
| 44 ASSERT(m_parent->rendererIsEditable() || !m_parent->attached()); | 43 ASSERT(m_parent->rendererIsEditable() || !m_parent->attached()); |
| 45 } | 44 } |
| 46 | 45 |
| 47 static void sendAXTextChangedIgnoringLineBreaks(Node* node, AXObjectCache::AXTex
tChange textChange) | |
| 48 { | |
| 49 String nodeValue = node->nodeValue(); | |
| 50 // Don't consider linebreaks in this command | |
| 51 if (nodeValue == "\n") | |
| 52 return; | |
| 53 | |
| 54 if (AXObjectCache* cache = node->document()->existingAXObjectCache()) | |
| 55 cache->nodeTextChangeNotification(node, textChange, 0, nodeValue); | |
| 56 } | |
| 57 | |
| 58 void AppendNodeCommand::doApply() | 46 void AppendNodeCommand::doApply() |
| 59 { | 47 { |
| 60 if (!m_parent->rendererIsEditable() && m_parent->attached()) | 48 if (!m_parent->rendererIsEditable() && m_parent->attached()) |
| 61 return; | 49 return; |
| 62 | 50 |
| 63 m_parent->appendChild(m_node.get(), IGNORE_EXCEPTION, AttachLazily); | 51 m_parent->appendChild(m_node.get(), IGNORE_EXCEPTION, AttachLazily); |
| 64 | |
| 65 if (AXObjectCache::accessibilityEnabled()) | |
| 66 sendAXTextChangedIgnoringLineBreaks(m_node.get(), AXObjectCache::AXTextI
nserted); | |
| 67 } | 52 } |
| 68 | 53 |
| 69 void AppendNodeCommand::doUnapply() | 54 void AppendNodeCommand::doUnapply() |
| 70 { | 55 { |
| 71 if (!m_parent->rendererIsEditable()) | 56 if (!m_parent->rendererIsEditable()) |
| 72 return; | 57 return; |
| 73 | 58 |
| 74 // Need to notify this before actually deleting the text | |
| 75 if (AXObjectCache::accessibilityEnabled()) | |
| 76 sendAXTextChangedIgnoringLineBreaks(m_node.get(), AXObjectCache::AXTextD
eleted); | |
| 77 | |
| 78 m_node->remove(IGNORE_EXCEPTION); | 59 m_node->remove(IGNORE_EXCEPTION); |
| 79 } | 60 } |
| 80 | 61 |
| 81 #ifndef NDEBUG | 62 #ifndef NDEBUG |
| 82 void AppendNodeCommand::getNodesInCommand(HashSet<Node*>& nodes) | 63 void AppendNodeCommand::getNodesInCommand(HashSet<Node*>& nodes) |
| 83 { | 64 { |
| 84 addNodeAndDescendants(m_parent.get(), nodes); | 65 addNodeAndDescendants(m_parent.get(), nodes); |
| 85 addNodeAndDescendants(m_node.get(), nodes); | 66 addNodeAndDescendants(m_node.get(), nodes); |
| 86 } | 67 } |
| 87 #endif | 68 #endif |
| 88 | 69 |
| 89 } // namespace WebCore | 70 } // namespace WebCore |
| OLD | NEW |