| OLD | NEW |
|---|
| (Empty) |
| 1 /* | |
| 2 * Copyright (C) 2005, 2006 Apple Computer, Inc. All rights reserved. | |
| 3 * | |
| 4 * Redistribution and use in source and binary forms, with or without | |
| 5 * modification, are permitted provided that the following conditions | |
| 6 * are met: | |
| 7 * 1. Redistributions of source code must retain the above copyright | |
| 8 * notice, this list of conditions and the following disclaimer. | |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | |
| 10 * notice, this list of conditions and the following disclaimer in the | |
| 11 * documentation and/or other materials provided with the distribution. | |
| 12 * | |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
| 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. | |
| 24 */ | |
| 25 | |
| 26 #include "config.h" | |
| 27 #include "core/editing/MoveSelectionCommand.h" | |
| 28 | |
| 29 #include "core/dom/DocumentFragment.h" | |
| 30 #include "core/editing/ReplaceSelectionCommand.h" | |
| 31 | |
| 32 namespace blink { | |
| 33 | |
| 34 MoveSelectionCommand::MoveSelectionCommand(PassRefPtrWillBeRawPtr<DocumentFragme
nt> fragment, const Position& position, bool smartInsert, bool smartDelete) | |
| 35 : CompositeEditCommand(*position.document()), m_fragment(fragment), m_positi
on(position), m_smartInsert(smartInsert), m_smartDelete(smartDelete) | |
| 36 { | |
| 37 ASSERT(m_fragment); | |
| 38 } | |
| 39 | |
| 40 void MoveSelectionCommand::doApply() | |
| 41 { | |
| 42 ASSERT(endingSelection().isNonOrphanedRange()); | |
| 43 | |
| 44 Position pos = m_position; | |
| 45 if (pos.isNull()) | |
| 46 return; | |
| 47 | |
| 48 // Update the position otherwise it may become invalid after the selection i
s deleted. | |
| 49 Position selectionEnd = endingSelection().end(); | |
| 50 if (pos.isOffsetInAnchor() && selectionEnd.isOffsetInAnchor() | |
| 51 && selectionEnd.computeContainerNode() == pos.computeContainerNode() &&
selectionEnd.offsetInContainerNode() < pos.offsetInContainerNode()) { | |
| 52 pos = Position(pos.computeContainerNode(), pos.offsetInContainerNode() -
selectionEnd.offsetInContainerNode()); | |
| 53 | |
| 54 Position selectionStart = endingSelection().start(); | |
| 55 if (selectionStart.isOffsetInAnchor() && selectionStart.computeContainer
Node() == pos.computeContainerNode()) | |
| 56 pos = Position(pos.computeContainerNode(), pos.offsetInContainerNode
() + selectionStart.offsetInContainerNode()); | |
| 57 } | |
| 58 | |
| 59 deleteSelection(m_smartDelete); | |
| 60 | |
| 61 // If the node for the destination has been removed as a result of the delet
ion, | |
| 62 // set the destination to the ending point after the deletion. | |
| 63 // Fixes: <rdar://problem/3910425> REGRESSION (Mail): Crash in ReplaceSelect
ionCommand; | |
| 64 // selection is empty, leading to null deref | |
| 65 if (!pos.inDocument()) | |
| 66 pos = endingSelection().start(); | |
| 67 | |
| 68 cleanupAfterDeletion(VisiblePosition(pos)); | |
| 69 | |
| 70 setEndingSelection(VisibleSelection(pos, endingSelection().affinity(), endin
gSelection().isDirectional())); | |
| 71 if (!pos.inDocument()) { | |
| 72 // Document was modified out from under us. | |
| 73 return; | |
| 74 } | |
| 75 ReplaceSelectionCommand::CommandOptions options = ReplaceSelectionCommand::S
electReplacement | ReplaceSelectionCommand::PreventNesting; | |
| 76 if (m_smartInsert) | |
| 77 options |= ReplaceSelectionCommand::SmartReplace; | |
| 78 applyCommandToComposite(ReplaceSelectionCommand::create(document(), m_fragme
nt, options)); | |
| 79 } | |
| 80 | |
| 81 EditAction MoveSelectionCommand::editingAction() const | |
| 82 { | |
| 83 return EditActionDrag; | |
| 84 } | |
| 85 | |
| 86 DEFINE_TRACE(MoveSelectionCommand) | |
| 87 { | |
| 88 visitor->trace(m_fragment); | |
| 89 visitor->trace(m_position); | |
| 90 CompositeEditCommand::trace(visitor); | |
| 91 } | |
| 92 | |
| 93 } // namespace blink | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1294543005:
Move execCommand related files in core/editing/ related files into core/editing/commands/ (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master