OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011 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 23 matching lines...) Expand all Loading... |
34 SetSelectionCommand::SetSelectionCommand(const VisibleSelection& selection, Fram
eSelection::SetSelectionOptions options) | 34 SetSelectionCommand::SetSelectionCommand(const VisibleSelection& selection, Fram
eSelection::SetSelectionOptions options) |
35 : SimpleEditCommand(*selection.base().document()) | 35 : SimpleEditCommand(*selection.base().document()) |
36 , m_options(options) | 36 , m_options(options) |
37 , m_selectionToSet(selection) | 37 , m_selectionToSet(selection) |
38 { | 38 { |
39 } | 39 } |
40 | 40 |
41 void SetSelectionCommand::doApply() | 41 void SetSelectionCommand::doApply() |
42 { | 42 { |
43 FrameSelection& selection = document().frame()->selection(); | 43 FrameSelection& selection = document().frame()->selection(); |
44 if (selection.shouldChangeSelection(m_selectionToSet) && m_selectionToSet.is
NonOrphanedCaretOrRange()) { | 44 selection.setSelection(m_selectionToSet, m_options); |
45 selection.setSelection(m_selectionToSet, m_options); | 45 setEndingSelection(m_selectionToSet); |
46 setEndingSelection(m_selectionToSet); | |
47 } | |
48 } | 46 } |
49 | 47 |
50 void SetSelectionCommand::doUnapply() | 48 void SetSelectionCommand::doUnapply() |
51 { | 49 { |
52 FrameSelection& selection = document().frame()->selection(); | 50 FrameSelection& selection = document().frame()->selection(); |
53 if (selection.shouldChangeSelection(startingSelection()) && startingSelectio
n().isNonOrphanedCaretOrRange()) | 51 selection.setSelection(startingSelection(), m_options); |
54 selection.setSelection(startingSelection(), m_options); | |
55 } | 52 } |
56 | 53 |
57 } // namespace WebCore | 54 } // namespace WebCore |
OLD | NEW |