diff options
Diffstat (limited to 'Source/WebCore/editing/AlternativeTextController.h')
| -rw-r--r-- | Source/WebCore/editing/AlternativeTextController.h | 43 |
1 files changed, 10 insertions, 33 deletions
diff --git a/Source/WebCore/editing/AlternativeTextController.h b/Source/WebCore/editing/AlternativeTextController.h index c843f603d..c583503ea 100644 --- a/Source/WebCore/editing/AlternativeTextController.h +++ b/Source/WebCore/editing/AlternativeTextController.h @@ -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 @@ -23,8 +23,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AlternativeTextController_h -#define AlternativeTextController_h +#pragma once #include "AlternativeTextClient.h" #include "DocumentMarker.h" @@ -48,7 +47,6 @@ struct DictationAlternative; class AlternativeTextDetails : public RefCounted<AlternativeTextDetails> { public: - AlternativeTextDetails() { } virtual ~AlternativeTextDetails() { } }; @@ -60,24 +58,6 @@ struct AlternativeTextInfo { RefPtr<AlternativeTextDetails> details; }; -class DictationMarkerDetails : public DocumentMarkerDetails { -public: - static PassRefPtr<DictationMarkerDetails> create(const String& originalText, uint64_t dictationContext) - { - return adoptRef(new DictationMarkerDetails(originalText, dictationContext)); - } - const String& originalText() const { return m_originalText; } - uint64_t dictationContext() const { return m_dictationContext; } -private: - DictationMarkerDetails(const String& originalText, uint64_t dictationContext) - : m_dictationContext(dictationContext) - , m_originalText(originalText) - { } - - uint64_t m_dictationContext; - String m_originalText; -}; - struct TextCheckingResult; #if USE(AUTOCORRECTION_PANEL) @@ -108,7 +88,7 @@ public: void respondToUnappliedSpellCorrection(const VisibleSelection&, const String& corrected, const String& correction) UNLESS_ENABLED({ UNUSED_PARAM(corrected); UNUSED_PARAM(correction); }) void respondToAppliedEditing(CompositeEditCommand*) UNLESS_ENABLED({ }) void respondToUnappliedEditing(EditCommandComposition*) UNLESS_ENABLED({ }) - void respondToChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions) UNLESS_ENABLED({ UNUSED_PARAM(oldSelection); }) + void respondToChangedSelection(const VisibleSelection& oldSelection) UNLESS_ENABLED({ UNUSED_PARAM(oldSelection); }) void stopPendingCorrection(const VisibleSelection& oldSelection) UNLESS_ENABLED({ UNUSED_PARAM(oldSelection); }) void applyPendingCorrection(const VisibleSelection& selectionAfterTyping) UNLESS_ENABLED({ UNUSED_PARAM(selectionAfterTyping); }) @@ -121,7 +101,7 @@ public: bool isAutomaticSpellingCorrectionEnabled() UNLESS_ENABLED({ return false; }) bool shouldRemoveMarkersUponEditing(); - void recordAutocorrectionResponseReversed(const String& replacedString, PassRefPtr<Range> replacementRange) UNLESS_ENABLED({ UNUSED_PARAM(replacedString); UNUSED_PARAM(replacementRange); }) + void recordAutocorrectionResponse(AutocorrectionResponse, const String& replacedString, PassRefPtr<Range> replacementRange) UNLESS_ENABLED({ UNUSED_PARAM(replacedString); UNUSED_PARAM(replacementRange); }) void markReversed(PassRefPtr<Range> changedRange) UNLESS_ENABLED({ UNUSED_PARAM(changedRange); }) void markCorrection(PassRefPtr<Range> replacedRange, const String& replacedString) UNLESS_ENABLED({ UNUSED_PARAM(replacedRange); UNUSED_PARAM(replacedString); }) @@ -130,21 +110,20 @@ public: void deletedAutocorrectionAtPosition(const Position&, const String& originalString) UNLESS_ENABLED({ UNUSED_PARAM(originalString); }) bool insertDictatedText(const String&, const Vector<DictationAlternative>&, Event*); - void removeDictationAlternativesForMarker(const DocumentMarker*); - Vector<String> dictationAlternativesForMarker(const DocumentMarker*); + void removeDictationAlternativesForMarker(const DocumentMarker&); + Vector<String> dictationAlternativesForMarker(const DocumentMarker&); void applyDictationAlternative(const String& alternativeString); private: #if USE(AUTOCORRECTION_PANEL) String dismissSoon(ReasonForDismissingAlternativeText); void applyAlternativeTextToRange(const Range*, const String& alternative, AlternativeTextType, const Vector<DocumentMarker::MarkerType>&); - void timerFired(Timer<AlternativeTextController>&); - void recordAutocorrectionResponseReversed(const String& replacedString, const String& replacementString); + void timerFired(); void recordSpellcheckerResponseForModifiedCorrection(Range* rangeOfCorrection, const String& corrected, const String& correction); String markerDescriptionForAppliedAlternativeText(AlternativeTextType, DocumentMarker::MarkerType); bool shouldStartTimerFor(const DocumentMarker&, int endOffset) const; - bool respondToMarkerAtEndOfWord(const DocumentMarker&, const Position& endOfWordPosition, FrameSelection::SetSelectionOptions); + bool respondToMarkerAtEndOfWord(const DocumentMarker&, const Position& endOfWordPosition); AlternativeTextClient* alternativeTextClient(); EditorClient* editorClient(); @@ -153,7 +132,7 @@ private: FloatRect rootViewRectForRange(const Range*) const; void markPrecedingWhitespaceForDeletedAutocorrectionAfterCommand(EditCommand*); - Timer<AlternativeTextController> m_timer; + Timer m_timer; AlternativeTextInfo m_alternativeTextInfo; bool m_isDismissedByEditing; @@ -176,5 +155,3 @@ inline bool AlternativeTextController::shouldRemoveMarkersUponEditing() } } // namespace WebCore - -#endif // AlternativeTextController_h |