diff options
Diffstat (limited to 'Source/WebCore/editing/SetSelectionCommand.cpp')
| -rw-r--r-- | Source/WebCore/editing/SetSelectionCommand.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/editing/SetSelectionCommand.cpp b/Source/WebCore/editing/SetSelectionCommand.cpp index f153a8d44..00a4d561d 100644 --- a/Source/WebCore/editing/SetSelectionCommand.cpp +++ b/Source/WebCore/editing/SetSelectionCommand.cpp @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -42,7 +42,7 @@ void SetSelectionCommand::doApply() { FrameSelection& selection = frame().selection(); - if (selection.shouldChangeSelection(m_selectionToSet) && m_selectionToSet.isNonOrphanedCaretOrRange()) { + if (selection.shouldChangeSelection(m_selectionToSet) && !m_selectionToSet.isNoneOrOrphaned()) { selection.setSelection(m_selectionToSet, m_options); setEndingSelection(m_selectionToSet); } @@ -52,7 +52,7 @@ void SetSelectionCommand::doUnapply() { FrameSelection& selection = frame().selection(); - if (selection.shouldChangeSelection(startingSelection()) && startingSelection().isNonOrphanedCaretOrRange()) + if (selection.shouldChangeSelection(startingSelection()) && !startingSelection().isNoneOrOrphaned()) selection.setSelection(startingSelection(), m_options); } |