Attachment 349583 Details for Bug 189019 – Patch

[patch] Patch

bug-189019-20180912143727.patch (text/plain), 30.67 KB, created by Alex Christensen on 2018-09-12 14:37:28 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-09-12 14:37:28 PDT

Size: 30.67 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 235942)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,29 @@
>+2018-09-12  Alex Christensen  <achristensen@webkit.org>
>+
>+        Use enum classes for AlternativeTextType and ReasonForDismissingAlternativeText
>+        https://bugs.webkit.org/show_bug.cgi?id=189019
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * editing/AlternativeTextController.cpp:
>+        (WebCore::AlternativeTextController::~AlternativeTextController):
>+        (WebCore::AlternativeTextController::startAlternativeTextUITimer):
>+        (WebCore::AlternativeTextController::stopPendingCorrection):
>+        (WebCore::AlternativeTextController::applyPendingCorrection):
>+        (WebCore::AlternativeTextController::handleCancelOperation):
>+        (WebCore::AlternativeTextController::applyAutocorrectionBeforeTypingIfAppropriate):
>+        (WebCore::AlternativeTextController::timerFired):
>+        (WebCore::AlternativeTextController::handleAlternativeTextUIResult):
>+        (WebCore::AlternativeTextController::respondToAppliedEditing):
>+        (WebCore::AlternativeTextController::respondToMarkerAtEndOfWord):
>+        (WebCore::AlternativeTextController::markerDescriptionForAppliedAlternativeText):
>+        (WebCore::AlternativeTextController::applyDictationAlternative):
>+        * editing/Editor.cpp:
>+        (WebCore::Editor::startAlternativeTextUITimer):
>+        (WebCore::Editor::dismissCorrectionPanelAsIgnored):
>+        * page/AlternativeTextClient.h:
>+        (): Deleted.
>+
> 2018-09-12  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [Win][Clang] error: non-constant-expression cannot be narrowed from type 'int' to 'SHORT'
>Index: Source/WebCore/editing/AlternativeTextController.cpp
>===================================================================
>--- Source/WebCore/editing/AlternativeTextController.cpp	(revision 235942)
>+++ Source/WebCore/editing/AlternativeTextController.cpp	(working copy)
>@@ -85,7 +85,7 @@ AlternativeTextController::AlternativeTe
> 
> AlternativeTextController::~AlternativeTextController()
> {
>-    dismiss(ReasonForDismissingAlternativeTextIgnored);
>+    dismiss(ReasonForDismissingAlternativeText::Ignored);
> }
> 
> void AlternativeTextController::startAlternativeTextUITimer(AlternativeTextType type)
>@@ -95,7 +95,7 @@ void AlternativeTextController::startAlt
>         return;
> 
>     // If type is PanelTypeReversion, then the new range has been set. So we shouldn't clear it.
>-    if (type == AlternativeTextTypeCorrection)
>+    if (type == AlternativeTextType::Correction)
>         m_rangeWithAlternative = nullptr;
>     m_type = type;
>     m_timer.startOneShot(correctionPanelTimerInterval);
>@@ -115,7 +115,7 @@ void AlternativeTextController::stopPend
>         return;
> 
>     stopAlternativeTextUITimer();
>-    dismiss(ReasonForDismissingAlternativeTextIgnored);
>+    dismiss(ReasonForDismissingAlternativeText::Ignored);
> }
> 
> void AlternativeTextController::applyPendingCorrection(const VisibleSelection& selectionAfterTyping)
>@@ -130,7 +130,7 @@ void AlternativeTextController::applyPen
>             doApplyCorrection = false;
>     }
>     if (doApplyCorrection)
>-        handleAlternativeTextUIResult(dismissSoon(ReasonForDismissingAlternativeTextAccepted)); 
>+        handleAlternativeTextUIResult(dismissSoon(ReasonForDismissingAlternativeText::Accepted)); 
>     else
>         m_rangeWithAlternative = nullptr;
> }
>@@ -163,7 +163,7 @@ void AlternativeTextController::handleCa
>     if (!m_isActive)
>         return;
>     m_isActive = false;
>-    dismiss(ReasonForDismissingAlternativeTextCancelled);
>+    dismiss(ReasonForDismissingAlternativeText::Cancelled);
> }
> 
> void AlternativeTextController::dismiss(ReasonForDismissingAlternativeText reasonForDismissing)
>@@ -242,19 +242,19 @@ bool AlternativeTextController::applyAut
>     if (!m_rangeWithAlternative || !m_isActive)
>         return false;
> 
>-    if (m_type != AlternativeTextTypeCorrection)
>+    if (m_type != AlternativeTextType::Correction)
>         return false;
> 
>     Position caretPosition = m_frame.selection().selection().start();
> 
>     if (m_rangeWithAlternative->endPosition() == caretPosition) {
>-        handleAlternativeTextUIResult(dismissSoon(ReasonForDismissingAlternativeTextAccepted));
>+        handleAlternativeTextUIResult(dismissSoon(ReasonForDismissingAlternativeText::Accepted));
>         return true;
>     } 
>     
>     // Pending correction should always be where caret is. But in case this is not always true, we still want to dismiss the panel without accepting the correction.
>     ASSERT(m_rangeWithAlternative->endPosition() == caretPosition);
>-    dismiss(ReasonForDismissingAlternativeTextIgnored);
>+    dismiss(ReasonForDismissingAlternativeText::Ignored);
>     return false;
> }
> 
>@@ -278,7 +278,7 @@ void AlternativeTextController::timerFir
> {
>     m_isDismissedByEditing = false;
>     switch (m_type) {
>-    case AlternativeTextTypeCorrection: {
>+    case AlternativeTextType::Correction: {
>         VisibleSelection selection(m_frame.selection().selection());
>         VisiblePosition start(selection.start(), selection.affinity());
>         VisiblePosition p = startOfWord(start, LeftWordIfOnBoundary);
>@@ -287,7 +287,7 @@ void AlternativeTextController::timerFir
>         m_frame.editor().markAllMisspellingsAndBadGrammarInRanges({ TextCheckingType::Spelling, TextCheckingType::Replacement, TextCheckingType::ShowCorrectionPanel }, adjacentWordRange.copyRef(), adjacentWordRange.copyRef(), nullptr);
>     }
>         break;
>-    case AlternativeTextTypeReversion: {
>+    case AlternativeTextType::Reversion: {
>         if (!m_rangeWithAlternative)
>             break;
>         String replacementString = WTF::get<AutocorrectionReplacement>(m_details);
>@@ -302,7 +302,7 @@ void AlternativeTextController::timerFir
>         }
>     }
>         break;
>-    case AlternativeTextTypeSpellingSuggestions: {
>+    case AlternativeTextType::SpellingSuggestions: {
>         if (!m_rangeWithAlternative || plainText(m_rangeWithAlternative.get()) != m_originalText)
>             break;
>         String paragraphText = plainText(&TextCheckingParagraph(*m_rangeWithAlternative).paragraphRange());
>@@ -322,7 +322,7 @@ void AlternativeTextController::timerFir
>         }
>     }
>         break;
>-    case AlternativeTextTypeDictationAlternatives:
>+    case AlternativeTextType::DictationAlternatives:
>     {
> #if USE(DICTATION_ALTERNATIVES)
>         if (!m_rangeWithAlternative)
>@@ -356,18 +356,18 @@ void AlternativeTextController::handleAl
>     m_isActive = false;
> 
>     switch (m_type) {
>-    case AlternativeTextTypeCorrection:
>+    case AlternativeTextType::Correction:
>         if (result.length())
>             applyAlternativeTextToRange(*rangeWithAlternative, result, m_type, markerTypesForAutocorrection());
>         else if (!m_isDismissedByEditing)
>             rangeWithAlternative->startContainer().document().markers().addMarker(rangeWithAlternative, DocumentMarker::RejectedCorrection, m_originalText);
>         break;
>-    case AlternativeTextTypeReversion:
>-    case AlternativeTextTypeSpellingSuggestions:
>+    case AlternativeTextType::Reversion:
>+    case AlternativeTextType::SpellingSuggestions:
>         if (result.length())
>             applyAlternativeTextToRange(*rangeWithAlternative, result, m_type, markerTypesForReplacement());
>         break;
>-    case AlternativeTextTypeDictationAlternatives:
>+    case AlternativeTextType::DictationAlternatives:
>         if (result.length())
>             applyAlternativeTextToRange(*rangeWithAlternative, result, m_type, markerTypesForAppliedDictationAlternative());
>         break;
>@@ -435,7 +435,7 @@ void AlternativeTextController::respondT
>     markPrecedingWhitespaceForDeletedAutocorrectionAfterCommand(command);
>     m_originalStringForLastDeletedAutocorrection = String();
> 
>-    dismiss(ReasonForDismissingAlternativeTextIgnored);
>+    dismiss(ReasonForDismissingAlternativeText::Ignored);
> }
> 
> void AlternativeTextController::respondToUnappliedEditing(EditCommandComposition* command)
>@@ -585,12 +585,12 @@ bool AlternativeTextController::respondT
>     case DocumentMarker::Spelling:
>         m_rangeWithAlternative = wordRange;
>         m_details = emptyString();
>-        startAlternativeTextUITimer(AlternativeTextTypeSpellingSuggestions);
>+        startAlternativeTextUITimer(AlternativeTextType::SpellingSuggestions);
>         break;
>     case DocumentMarker::Replacement:
>         m_rangeWithAlternative = wordRange;
>         m_details = marker.description();
>-        startAlternativeTextUITimer(AlternativeTextTypeReversion);
>+        startAlternativeTextUITimer(AlternativeTextType::Reversion);
>         break;
>     case DocumentMarker::DictationAlternatives: {
>         if (!WTF::holds_alternative<DocumentMarker::DictationData>(marker.data()))
>@@ -600,7 +600,7 @@ bool AlternativeTextController::respondT
>             return false;
>         m_rangeWithAlternative = wordRange;
>         m_details = markerData.context;
>-        startAlternativeTextUITimer(AlternativeTextTypeDictationAlternatives);
>+        startAlternativeTextUITimer(AlternativeTextType::DictationAlternatives);
>     }
>         break;
>     default:
>@@ -613,7 +613,7 @@ bool AlternativeTextController::respondT
> String AlternativeTextController::markerDescriptionForAppliedAlternativeText(AlternativeTextType alternativeTextType, DocumentMarker::MarkerType markerType)
> {
> 
>-    if (alternativeTextType != AlternativeTextTypeReversion && alternativeTextType != AlternativeTextTypeDictationAlternatives && (markerType == DocumentMarker::Replacement || markerType == DocumentMarker::Autocorrected))
>+    if (alternativeTextType != AlternativeTextType::Reversion && alternativeTextType != AlternativeTextType::DictationAlternatives && (markerType == DocumentMarker::Replacement || markerType == DocumentMarker::Autocorrected))
>         return m_originalText;
>     return emptyString();
> }
>@@ -676,7 +676,7 @@ void AlternativeTextController::applyDic
>     for (auto* marker : dictationAlternativesMarkers)
>         removeDictationAlternativesForMarker(*marker);
> 
>-    applyAlternativeTextToRange(*selection, alternativeString, AlternativeTextTypeDictationAlternatives, markerTypesForAppliedDictationAlternative());
>+    applyAlternativeTextToRange(*selection, alternativeString, AlternativeTextType::DictationAlternatives, markerTypesForAppliedDictationAlternative());
> #else
>     UNUSED_PARAM(alternativeString);
> #endif
>Index: Source/WebCore/editing/Editor.cpp
>===================================================================
>--- Source/WebCore/editing/Editor.cpp	(revision 235942)
>+++ Source/WebCore/editing/Editor.cpp	(working copy)
>@@ -3094,7 +3094,7 @@ void Editor::addTextToKillRing(const Str
> 
> void Editor::startAlternativeTextUITimer()
> {
>-    m_alternativeTextController->startAlternativeTextUITimer(AlternativeTextTypeCorrection);
>+    m_alternativeTextController->startAlternativeTextUITimer(AlternativeTextType::Correction);
> }
> 
> void Editor::handleAlternativeTextUIResult(const String& correction)
>@@ -3105,7 +3105,7 @@ void Editor::handleAlternativeTextUIResu
> 
> void Editor::dismissCorrectionPanelAsIgnored()
> {
>-    m_alternativeTextController->dismiss(ReasonForDismissingAlternativeTextIgnored);
>+    m_alternativeTextController->dismiss(ReasonForDismissingAlternativeText::Ignored);
> }
> 
> void Editor::changeSelectionAfterCommand(const VisibleSelection& newSelection, OptionSet<FrameSelection::SetSelectionOption> options)
>Index: Source/WebCore/page/AlternativeTextClient.h
>===================================================================
>--- Source/WebCore/page/AlternativeTextClient.h	(revision 235942)
>+++ Source/WebCore/page/AlternativeTextClient.h	(working copy)
>@@ -26,22 +26,23 @@
> #pragma once
> 
> #include "FloatRect.h"
>+#include <wtf/EnumTraits.h>
> #include <wtf/Vector.h>
> #include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
>-enum ReasonForDismissingAlternativeText {
>-    ReasonForDismissingAlternativeTextCancelled = 0,
>-    ReasonForDismissingAlternativeTextIgnored,
>-    ReasonForDismissingAlternativeTextAccepted
>+enum class ReasonForDismissingAlternativeText {
>+    Cancelled = 0,
>+    Ignored,
>+    Accepted
> };
> 
>-enum AlternativeTextType {
>-    AlternativeTextTypeCorrection = 0,
>-    AlternativeTextTypeReversion,
>-    AlternativeTextTypeSpellingSuggestions,
>-    AlternativeTextTypeDictationAlternatives
>+enum class AlternativeTextType {
>+    Correction = 0,
>+    Reversion,
>+    SpellingSuggestions,
>+    DictationAlternatives
> };
> 
> enum class AutocorrectionResponse {
>@@ -68,3 +69,35 @@ public:
> };
>     
> } // namespace WebCore
>+
>+namespace WTF {
>+
>+template<> struct EnumTraits<WebCore::ReasonForDismissingAlternativeText> {
>+    using values = EnumValues<
>+        WebCore::ReasonForDismissingAlternativeText,
>+        WebCore::ReasonForDismissingAlternativeText::Cancelled,
>+        WebCore::ReasonForDismissingAlternativeText::Ignored,
>+        WebCore::ReasonForDismissingAlternativeText::Accepted
>+    >;
>+};
>+
>+template<> struct EnumTraits<WebCore::AlternativeTextType> {
>+    using values = EnumValues<
>+        WebCore::AlternativeTextType,
>+        WebCore::AlternativeTextType::Correction,
>+        WebCore::AlternativeTextType::Reversion,
>+        WebCore::AlternativeTextType::SpellingSuggestions,
>+        WebCore::AlternativeTextType::DictationAlternatives
>+    >;
>+};
>+
>+template<> struct EnumTraits<WebCore::AutocorrectionResponse> {
>+    using values = EnumValues<
>+        WebCore::AutocorrectionResponse,
>+        WebCore::AutocorrectionResponse::Edited,
>+        WebCore::AutocorrectionResponse::Reverted,
>+        WebCore::AutocorrectionResponse::Accepted
>+    >;
>+};
>+
>+}
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 235942)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,21 @@
>+2018-09-12  Alex Christensen  <achristensen@webkit.org>
>+
>+        Use enum classes for AlternativeTextType and ReasonForDismissingAlternativeText
>+        https://bugs.webkit.org/show_bug.cgi?id=189019
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/Cocoa/WebViewImpl.mm:
>+        (WebKit::WebViewImpl::dismissContentRelativeChildWindowsFromViewOnly):
>+        * UIProcess/mac/CorrectionPanel.mm:
>+        (correctionIndicatorType):
>+        (WebKit::CorrectionPanel::CorrectionPanel):
>+        (WebKit::CorrectionPanel::~CorrectionPanel):
>+        (WebKit::CorrectionPanel::show):
>+        (WebKit::CorrectionPanel::handleAcceptedReplacement):
>+        * WebProcess/WebCoreSupport/mac/WebAlternativeTextClient.cpp:
>+        (WebKit::WebAlternativeTextClient::~WebAlternativeTextClient):
>+
> 2018-09-12  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [Win][Clang] error: non-constant-expression cannot be narrowed from type 'int' to 'SHORT'
>Index: Source/WebKit/Scripts/webkit/messages.py
>===================================================================
>--- Source/WebKit/Scripts/webkit/messages.py	(revision 235942)
>+++ Source/WebKit/Scripts/webkit/messages.py	(working copy)
>@@ -377,6 +377,8 @@ def headers_for_type(type):
>         'WallTime': ['<wtf/WallTime.h>'],
>         'String': ['<wtf/text/WTFString.h>'],
>         'PAL::SessionID': ['<pal/SessionID.h>'],
>+        'WebCore::AlternativeTextType': ['<WebCore/AlternativeTextClient.h>'],
>+        'WebCore::AutocorrectionResponse': ['<WebCore/AlternativeTextClient.h>'],
>         'WebCore::AutoplayEventFlags': ['<WebCore/AutoplayEvent.h>'],
>         'WebCore::ExceptionDetails': ['<WebCore/JSDOMExceptionHandling.h>'],
>         'WebCore::FileChooserSettings': ['<WebCore/FileChooser.h>'],
>@@ -398,6 +400,7 @@ def headers_for_type(type):
>         'WebCore::PaymentMethodUpdate': ['<WebCore/ApplePaySessionPaymentRequest.h>'],
>         'WebCore::PluginInfo': ['<WebCore/PluginData.h>'],
>         'WebCore::PolicyAction': ['<WebCore/FrameLoaderTypes.h>'],
>+        'WebCore::ReasonForDismissingAlternativeText': ['<WebCore/AlternativeTextClient.h>'],
>         'WebCore::RecentSearch': ['<WebCore/SearchPopupMenu.h>'],
>         'WebCore::RouteSharingPolicy': ['<WebCore/AudioSession.h>'],
>         'WebCore::SWServerConnectionIdentifier': ['<WebCore/ServiceWorkerTypes.h>'],
>Index: Source/WebKit/UIProcess/WebPageProxy.cpp
>===================================================================
>--- Source/WebKit/UIProcess/WebPageProxy.cpp	(revision 235942)
>+++ Source/WebKit/UIProcess/WebPageProxy.cpp	(working copy)
>@@ -6805,24 +6805,24 @@ void WebPageProxy::substitutionsPanelIsS
>     isShowing = TextChecker::substitutionsPanelIsShowing();
> }
> 
>-void WebPageProxy::showCorrectionPanel(int32_t panelType, const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings)
>+void WebPageProxy::showCorrectionPanel(AlternativeTextType panelType, const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings)
> {
>-    pageClient().showCorrectionPanel((AlternativeTextType)panelType, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings);
>+    pageClient().showCorrectionPanel(panelType, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings);
> }
> 
>-void WebPageProxy::dismissCorrectionPanel(int32_t reason)
>+void WebPageProxy::dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText reason)
> {
>-    pageClient().dismissCorrectionPanel((ReasonForDismissingAlternativeText)reason);
>+    pageClient().dismissCorrectionPanel(reason);
> }
> 
>-void WebPageProxy::dismissCorrectionPanelSoon(int32_t reason, String& result)
>+void WebPageProxy::dismissCorrectionPanelSoon(ReasonForDismissingAlternativeText reason, String& result)
> {
>-    result = pageClient().dismissCorrectionPanelSoon((ReasonForDismissingAlternativeText)reason);
>+    result = pageClient().dismissCorrectionPanelSoon(reason);
> }
> 
>-void WebPageProxy::recordAutocorrectionResponse(int32_t response, const String& replacedString, const String& replacementString)
>+void WebPageProxy::recordAutocorrectionResponse(AutocorrectionResponse response, const String& replacedString, const String& replacementString)
> {
>-    pageClient().recordAutocorrectionResponse(static_cast<AutocorrectionResponse>(response), replacedString, replacementString);
>+    pageClient().recordAutocorrectionResponse(response, replacedString, replacementString);
> }
> 
> void WebPageProxy::handleAlternativeTextUIResult(const String& result)
>Index: Source/WebKit/UIProcess/WebPageProxy.h
>===================================================================
>--- Source/WebKit/UIProcess/WebPageProxy.h	(revision 235942)
>+++ Source/WebKit/UIProcess/WebPageProxy.h	(working copy)
>@@ -174,9 +174,11 @@ class ValidationBubble;
> 
> enum SelectionDirection : uint8_t;
> 
>+enum class AlternativeTextType;
> enum class AutoplayEvent;
> enum class HasInsecureContent;
> enum class NotificationDirection;
>+enum class ReasonForDismissingAlternativeText;
> enum class ShouldSample;
> enum class ShouldTreatAsContinuingLoad;
> 
>@@ -1684,10 +1686,10 @@ private:
> 
> #if PLATFORM(MAC)
>     void substitutionsPanelIsShowing(bool&);
>-    void showCorrectionPanel(int32_t panelType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings);
>-    void dismissCorrectionPanel(int32_t reason);
>-    void dismissCorrectionPanelSoon(int32_t reason, String& result);
>-    void recordAutocorrectionResponse(int32_t responseType, const String& replacedString, const String& replacementString);
>+    void showCorrectionPanel(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings);
>+    void dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText);
>+    void dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText, String& result);
>+    void recordAutocorrectionResponse(WebCore::AutocorrectionResponse, const String& replacedString, const String& replacementString);
> 
> #if USE(DICTATION_ALTERNATIVES)
>     void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext);
>Index: Source/WebKit/UIProcess/WebPageProxy.messages.in
>===================================================================
>--- Source/WebKit/UIProcess/WebPageProxy.messages.in	(revision 235942)
>+++ Source/WebKit/UIProcess/WebPageProxy.messages.in	(working copy)
>@@ -376,10 +376,10 @@ messages -> WebPageProxy {
> #endif
> #if PLATFORM(MAC)
>     # Autocorrection messages
>-    ShowCorrectionPanel(int32_t panelType, WebCore::FloatRect boundingBoxOfReplacedString, String replacedString, String replacementString, Vector<String> alternativeReplacementStrings)
>-    DismissCorrectionPanel(int32_t reason)
>-    DismissCorrectionPanelSoon(int32_t reason) -> (String result)
>-    RecordAutocorrectionResponse(int32_t response, String replacedString, String replacementString);
>+    ShowCorrectionPanel(enum WebCore::AlternativeTextType panelType, WebCore::FloatRect boundingBoxOfReplacedString, String replacedString, String replacementString, Vector<String> alternativeReplacementStrings)
>+    DismissCorrectionPanel(enum WebCore::ReasonForDismissingAlternativeText reason)
>+    DismissCorrectionPanelSoon(enum WebCore::ReasonForDismissingAlternativeText reason) -> (String result)
>+    RecordAutocorrectionResponse(enum WebCore::AutocorrectionResponse response, String replacedString, String replacementString);
> 
>     SetEditableElementIsFocused(bool editableElementIsFocused)
> #endif
>Index: Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	(revision 235942)
>+++ Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	(working copy)
>@@ -3348,7 +3348,7 @@ void WebViewImpl::dismissContentRelative
> 
>     [m_immediateActionController dismissContentRelativeChildWindows];
> 
>-    m_pageClient->dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeTextIgnored);
>+    m_pageClient->dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText::Ignored);
> }
> 
> void WebViewImpl::hideWordDefinitionWindow()
>Index: Source/WebKit/UIProcess/mac/CorrectionPanel.mm
>===================================================================
>--- Source/WebKit/UIProcess/mac/CorrectionPanel.mm	(revision 235942)
>+++ Source/WebKit/UIProcess/mac/CorrectionPanel.mm	(working copy)
>@@ -34,13 +34,13 @@
> static inline NSCorrectionIndicatorType correctionIndicatorType(WebCore::AlternativeTextType alternativeTextType)
> {
>     switch (alternativeTextType) {
>-    case WebCore::AlternativeTextTypeCorrection:
>+    case WebCore::AlternativeTextType::Correction:
>         return NSCorrectionIndicatorTypeDefault;
>-    case WebCore::AlternativeTextTypeReversion:
>+    case WebCore::AlternativeTextType::Reversion:
>         return NSCorrectionIndicatorTypeReversion;
>-    case WebCore::AlternativeTextTypeSpellingSuggestions:
>+    case WebCore::AlternativeTextType::SpellingSuggestions:
>         return NSCorrectionIndicatorTypeGuesses;
>-    case WebCore::AlternativeTextTypeDictationAlternatives:
>+    case WebCore::AlternativeTextType::DictationAlternatives:
>         ASSERT_NOT_REACHED();
>         break;
>     }
>@@ -53,18 +53,18 @@ using namespace WebCore;
> 
> CorrectionPanel::CorrectionPanel()
>     : m_wasDismissedExternally(false)
>-    , m_reasonForDismissing(ReasonForDismissingAlternativeTextIgnored)
>+    , m_reasonForDismissing(ReasonForDismissingAlternativeText::Ignored)
> {
> }
> 
> CorrectionPanel::~CorrectionPanel()
> {
>-    dismissInternal(ReasonForDismissingAlternativeTextIgnored, false);
>+    dismissInternal(ReasonForDismissingAlternativeText::Ignored, false);
> }
> 
> void CorrectionPanel::show(NSView *view, WebViewImpl& webViewImpl, AlternativeTextType type, const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings)
> {
>-    dismissInternal(ReasonForDismissingAlternativeTextIgnored, false);
>+    dismissInternal(ReasonForDismissingAlternativeText::Ignored, false);
>     
>     if (!view)
>         return;
>@@ -126,7 +126,7 @@ void CorrectionPanel::handleAcceptedRepl
>         if (acceptedReplacement)
>             recordAutocorrectionResponse(webViewImpl, m_spellCheckerDocumentTag, NSCorrectionResponseAccepted, replaced, acceptedReplacement);
>         else {
>-            if (!m_wasDismissedExternally || m_reasonForDismissing == ReasonForDismissingAlternativeTextCancelled)
>+            if (!m_wasDismissedExternally || m_reasonForDismissing == ReasonForDismissingAlternativeText::Cancelled)
>                 recordAutocorrectionResponse(webViewImpl, m_spellCheckerDocumentTag, NSCorrectionResponseRejected, replaced, proposedReplacement);
>             else
>                 recordAutocorrectionResponse(webViewImpl, m_spellCheckerDocumentTag, NSCorrectionResponseIgnored, replaced, proposedReplacement);
>Index: Source/WebKit/WebProcess/WebCoreSupport/mac/WebAlternativeTextClient.cpp
>===================================================================
>--- Source/WebKit/WebProcess/WebCoreSupport/mac/WebAlternativeTextClient.cpp	(revision 235942)
>+++ Source/WebKit/WebProcess/WebCoreSupport/mac/WebAlternativeTextClient.cpp	(working copy)
>@@ -41,7 +41,7 @@ WebAlternativeTextClient::WebAlternative
> WebAlternativeTextClient::~WebAlternativeTextClient()
> {
> #if USE(AUTOCORRECTION_PANEL)
>-    m_page->send(Messages::WebPageProxy::DismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored));
>+    m_page->send(Messages::WebPageProxy::DismissCorrectionPanel(ReasonForDismissingAlternativeText::Ignored));
> #endif
> }
> 
>@@ -70,7 +70,7 @@ String WebAlternativeTextClient::dismiss
> 
> void WebAlternativeTextClient::recordAutocorrectionResponse(AutocorrectionResponse response, const String& replacedString, const String& replacementString)
> {
>-    m_page->send(Messages::WebPageProxy::RecordAutocorrectionResponse(static_cast<int32_t>(response), replacedString, replacementString));
>+    m_page->send(Messages::WebPageProxy::RecordAutocorrectionResponse(response, replacedString, replacementString));
> }
> #endif
> 
>Index: Source/WebKitLegacy/mac/ChangeLog
>===================================================================
>--- Source/WebKitLegacy/mac/ChangeLog	(revision 235942)
>+++ Source/WebKitLegacy/mac/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2018-09-12  Alex Christensen  <achristensen@webkit.org>
>+
>+        Use enum classes for AlternativeTextType and ReasonForDismissingAlternativeText
>+        https://bugs.webkit.org/show_bug.cgi?id=189019
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCoreSupport/CorrectionPanel.h:
>+        * WebCoreSupport/CorrectionPanel.mm:
>+        (correctionIndicatorType):
>+        (CorrectionPanel::CorrectionPanel):
>+        (CorrectionPanel::~CorrectionPanel):
>+        (CorrectionPanel::show):
>+        (CorrectionPanel::handleAcceptedReplacement):
>+        * WebCoreSupport/WebAlternativeTextClient.mm:
>+        (WebAlternativeTextClient::~WebAlternativeTextClient):
>+
> 2018-09-12  Guillaume Emont  <guijemont@igalia.com>
> 
>         Add IGNORE_WARNING_.* macros
>Index: Source/WebKitLegacy/mac/WebCoreSupport/CorrectionPanel.h
>===================================================================
>--- Source/WebKitLegacy/mac/WebCoreSupport/CorrectionPanel.h	(revision 235942)
>+++ Source/WebKitLegacy/mac/WebCoreSupport/CorrectionPanel.h	(working copy)
>@@ -23,8 +23,7 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#ifndef CorrectionPanel_h
>-#define CorrectionPanel_h
>+#pragma once
> 
> #if USE(AUTOCORRECTION_PANEL)
> 
>@@ -55,5 +54,3 @@ private:
> };
> 
> #endif // USE(AUTOCORRECTION_PANEL)
>-
>-#endif // CorrectionPanel_h
>Index: Source/WebKitLegacy/mac/WebCoreSupport/CorrectionPanel.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebCoreSupport/CorrectionPanel.mm	(revision 235942)
>+++ Source/WebKitLegacy/mac/WebCoreSupport/CorrectionPanel.mm	(working copy)
>@@ -32,13 +32,13 @@ using namespace WebCore;
> static inline NSCorrectionIndicatorType correctionIndicatorType(AlternativeTextType alternativeTextType)
> {
>     switch (alternativeTextType) {
>-    case AlternativeTextTypeCorrection:
>+    case AlternativeTextType::Correction:
>         return NSCorrectionIndicatorTypeDefault;
>-    case AlternativeTextTypeReversion:
>+    case AlternativeTextType::Reversion:
>         return NSCorrectionIndicatorTypeReversion;
>-    case AlternativeTextTypeSpellingSuggestions:
>+    case AlternativeTextType::SpellingSuggestions:
>         return NSCorrectionIndicatorTypeGuesses;
>-    case AlternativeTextTypeDictationAlternatives:
>+    case AlternativeTextType::DictationAlternatives:
>         ASSERT_NOT_REACHED();
>         break;
>     }
>@@ -48,18 +48,18 @@ static inline NSCorrectionIndicatorType 
> 
> CorrectionPanel::CorrectionPanel()
>     : m_wasDismissedExternally(false)
>-    , m_reasonForDismissing(ReasonForDismissingAlternativeTextIgnored)
>+    , m_reasonForDismissing(ReasonForDismissingAlternativeText::Ignored)
> {
> }
> 
> CorrectionPanel::~CorrectionPanel()
> {
>-    dismissInternal(ReasonForDismissingAlternativeTextIgnored, false);
>+    dismissInternal(ReasonForDismissingAlternativeText::Ignored, false);
> }
> 
> void CorrectionPanel::show(WebView* view, AlternativeTextType type, const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings)
> {
>-    dismissInternal(ReasonForDismissingAlternativeTextIgnored, false);
>+    dismissInternal(ReasonForDismissingAlternativeText::Ignored, false);
>     
>     if (!view)
>         return;
>@@ -116,7 +116,7 @@ void CorrectionPanel::handleAcceptedRepl
>         if (acceptedReplacement)
>             recordAutocorrectionResponse(documentTag, NSCorrectionResponseAccepted, replaced, acceptedReplacement);
>         else {
>-            if (!m_wasDismissedExternally || m_reasonForDismissing == ReasonForDismissingAlternativeTextCancelled)
>+            if (!m_wasDismissedExternally || m_reasonForDismissing == ReasonForDismissingAlternativeText::Cancelled)
>                 recordAutocorrectionResponse(documentTag, NSCorrectionResponseRejected, replaced, proposedReplacement);
>             else
>                 recordAutocorrectionResponse(documentTag, NSCorrectionResponseIgnored, replaced, proposedReplacement);
>Index: Source/WebKitLegacy/mac/WebCoreSupport/WebAlternativeTextClient.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebCoreSupport/WebAlternativeTextClient.mm	(revision 235942)
>+++ Source/WebKitLegacy/mac/WebCoreSupport/WebAlternativeTextClient.mm	(working copy)
>@@ -37,7 +37,7 @@ WebAlternativeTextClient::WebAlternative
> WebAlternativeTextClient::~WebAlternativeTextClient()
> {
> #if USE(AUTOCORRECTION_PANEL)
>-    dismissAlternative(ReasonForDismissingAlternativeTextIgnored);
>+    dismissAlternative(ReasonForDismissingAlternativeText::Ignored);
> #endif
> }
>

Flags:

simon.fraser: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 189019: 348218 | 349583 | 349619 | 349647