[IPC] Adopt enum class for AutocapitalizeType

<https://webkit.org/b/212846> <rdar://problem/64042825> Reviewed by Darin Adler. Summary: - Move AutocapitalizeType into WebCore namespace. - Convert AutocapitalizeType to an enum class. - Add WTF::EnumTraits<AutocapitalizeType> for IPC. Source/WebCore: * html/Autocapitalize.cpp: (WebCore::autocapitalizeTypeForAttributeValue): (WebCore::stringForAutocapitalizeType): * html/AutocapitalizeTypes.h: * html/HTMLFormControlElement.cpp: (WebCore::HTMLFormControlElement::autocapitalizeType const): Source/WebKit: * Shared/FocusedElementInformation.cpp: (WebKit::FocusedElementInformation::encode const): (WebKit::FocusedElementInformation::decode): - Stop using decodeEnum() and encodeEnum() now that WTF::EnumTraits<AutocapitalizeType> exists. * Shared/FocusedElementInformation.h: * Shared/glib/InputMethodState.cpp: (WebKit::InputMethodState::addHintsForAutocapitalizeType): * Shared/glib/InputMethodState.h: * UIProcess/ios/WKContentViewInteraction.mm: (toUITextAutocapitalize): * WebProcess/WebPage/ios/WebPageIOS.mm: (WebKit::WebPage::getFocusedElementInformation): Source/WebKitLegacy/mac: * DOM/DOMHTML.mm: (webAutocapitalizeType): Canonical link: https://commits.webkit.org/225664@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@262665 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Jun 6, 2020 · f03432c · f03432c
1 parent 9fc30f1
commit f03432c
Show file tree

Hide file tree

Showing 13 changed files with 130 additions and 46 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2020-06-05  David Kilzer  <ddkilzer@apple.com>
+
+        [IPC] Adopt enum class for AutocapitalizeType
+        <https://webkit.org/b/212846>
+        <rdar://problem/64042825>
+
+        Reviewed by Darin Adler.
+
+        Summary:
+        - Move AutocapitalizeType into WebCore namespace.
+        - Convert AutocapitalizeType to an enum class.
+        - Add WTF::EnumTraits<AutocapitalizeType> for IPC.
+
+        * html/Autocapitalize.cpp:
+        (WebCore::autocapitalizeTypeForAttributeValue):
+        (WebCore::stringForAutocapitalizeType):
+        * html/AutocapitalizeTypes.h:
+        * html/HTMLFormControlElement.cpp:
+        (WebCore::HTMLFormControlElement::autocapitalizeType const):
+
 2020-06-05  Ryan Haddad  <ryanhaddad@apple.com>
 
         Unreviewed, reverting r262619, r262625, and r262641.

diff --git a/Source/WebCore/html/Autocapitalize.cpp b/Source/WebCore/html/Autocapitalize.cpp
@@ -36,39 +36,39 @@ AutocapitalizeType autocapitalizeTypeForAttributeValue(const AtomString& attribu
 {
     // Omitted / missing values are the Default state.
     if (attributeValue.isEmpty())
-        return AutocapitalizeTypeDefault;
+        return AutocapitalizeType::Default;
 
     if (equalLettersIgnoringASCIICase(attributeValue, "on") || equalLettersIgnoringASCIICase(attributeValue, "sentences"))
-        return AutocapitalizeTypeSentences;
+        return AutocapitalizeType::Sentences;
     if (equalLettersIgnoringASCIICase(attributeValue, "off") || equalLettersIgnoringASCIICase(attributeValue, "none"))
-        return AutocapitalizeTypeNone;
+        return AutocapitalizeType::None;
     if (equalLettersIgnoringASCIICase(attributeValue, "words"))
-        return AutocapitalizeTypeWords;
+        return AutocapitalizeType::Words;
     if (equalLettersIgnoringASCIICase(attributeValue, "characters"))
-        return AutocapitalizeTypeAllCharacters;
+        return AutocapitalizeType::AllCharacters;
 
     // Unrecognized values fall back to "on".
-    return AutocapitalizeTypeSentences;
+    return AutocapitalizeType::Sentences;
 }
 
 const AtomString& stringForAutocapitalizeType(AutocapitalizeType type)
 {
     switch (type) {
-    case AutocapitalizeTypeDefault:
+    case AutocapitalizeType::Default:
         return nullAtom();
-    case AutocapitalizeTypeNone: {
+    case AutocapitalizeType::None: {
         static MainThreadNeverDestroyed<const AtomString> valueNone("none", AtomString::ConstructFromLiteral);
         return valueNone;
     }
-    case AutocapitalizeTypeSentences: {
+    case AutocapitalizeType::Sentences: {
         static MainThreadNeverDestroyed<const AtomString> valueSentences("sentences", AtomString::ConstructFromLiteral);
         return valueSentences;
     }
-    case AutocapitalizeTypeWords: {
+    case AutocapitalizeType::Words: {
         static MainThreadNeverDestroyed<const AtomString> valueWords("words", AtomString::ConstructFromLiteral);
         return valueWords;
     }
-    case AutocapitalizeTypeAllCharacters: {
+    case AutocapitalizeType::AllCharacters: {
         static MainThreadNeverDestroyed<const AtomString> valueAllCharacters("characters", AtomString::ConstructFromLiteral);
         return valueAllCharacters;
     }

diff --git a/Source/WebCore/html/AutocapitalizeTypes.h b/Source/WebCore/html/AutocapitalizeTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2011-2020 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,10 +25,31 @@
 
 #pragma once
 
-typedef enum {
-    AutocapitalizeTypeDefault,
-    AutocapitalizeTypeNone,
-    AutocapitalizeTypeWords,
-    AutocapitalizeTypeSentences,
-    AutocapitalizeTypeAllCharacters
-} AutocapitalizeType;
+#include <wtf/EnumTraits.h>
+
+namespace WebCore {
+
+enum class AutocapitalizeType : uint8_t {
+    Default,
+    None,
+    Words,
+    Sentences,
+    AllCharacters
+};
+
+} // namespace WebCore
+
+namespace WTF {
+
+template<> struct EnumTraits<WebCore::AutocapitalizeType> {
+    using values = EnumValues<
+        WebCore::AutocapitalizeType,
+        WebCore::AutocapitalizeType::Default,
+        WebCore::AutocapitalizeType::None,
+        WebCore::AutocapitalizeType::Words,
+        WebCore::AutocapitalizeType::Sentences,
+        WebCore::AutocapitalizeType::AllCharacters
+    >;
+};
+
+} // namespace WTF
diff --git a/Source/WebCore/html/HTMLFormControlElement.cpp b/Source/WebCore/html/HTMLFormControlElement.cpp
@@ -633,7 +633,7 @@ bool HTMLFormControlElement::shouldAutocorrect() const
 AutocapitalizeType HTMLFormControlElement::autocapitalizeType() const
 {
     AutocapitalizeType type = HTMLElement::autocapitalizeType();
-    if (type == AutocapitalizeTypeDefault) {
+    if (type == AutocapitalizeType::Default) {
         if (RefPtr<HTMLFormElement> form = this->form())
             return form->autocapitalizeType();
     }

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,30 @@
+2020-06-05  David Kilzer  <ddkilzer@apple.com>
+
+        [IPC] Adopt enum class for AutocapitalizeType
+        <https://webkit.org/b/212846>
+        <rdar://problem/64042825>
+
+        Reviewed by Darin Adler.
+
+        Summary:
+        - Move AutocapitalizeType into WebCore namespace.
+        - Convert AutocapitalizeType to an enum class.
+        - Add WTF::EnumTraits<AutocapitalizeType> for IPC.
+
+        * Shared/FocusedElementInformation.cpp:
+        (WebKit::FocusedElementInformation::encode const):
+        (WebKit::FocusedElementInformation::decode):
+        - Stop using decodeEnum() and encodeEnum() now that
+          WTF::EnumTraits<AutocapitalizeType> exists.
+        * Shared/FocusedElementInformation.h:
+        * Shared/glib/InputMethodState.cpp:
+        (WebKit::InputMethodState::addHintsForAutocapitalizeType):
+        * Shared/glib/InputMethodState.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (toUITextAutocapitalize):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::getFocusedElementInformation):
+
 2020-06-05  Brent Fulgham  <bfulgham@apple.com>
 
         [iOS] Silence telemetry generated during download operations

diff --git a/Source/WebKit/Shared/FocusedElementInformation.cpp b/Source/WebKit/Shared/FocusedElementInformation.cpp
@@ -76,7 +76,7 @@ void FocusedElementInformation::encode(IPC::Encoder& encoder) const
     encoder << previousNodeRect;
     encoder << isAutocorrect;
     encoder << isRTL;
-    encoder.encodeEnum(autocapitalizeType);
+    encoder << autocapitalizeType;
     encoder.encodeEnum(elementType);
     encoder.encodeEnum(inputMode);
     encoder.encodeEnum(enterKeyHint);
@@ -154,7 +154,7 @@ bool FocusedElementInformation::decode(IPC::Decoder& decoder, FocusedElementInfo
     if (!decoder.decode(result.isRTL))
         return false;
 
-    if (!decoder.decodeEnum(result.autocapitalizeType))
+    if (!decoder.decode(result.autocapitalizeType))
         return false;
 
     if (!decoder.decodeEnum(result.elementType))

diff --git a/Source/WebKit/Shared/FocusedElementInformation.h b/Source/WebKit/Shared/FocusedElementInformation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -116,7 +116,7 @@ struct FocusedElementInformation {
     bool allowsUserScaling { false };
     bool allowsUserScalingIgnoringAlwaysScalable { false };
     bool insideFixedPosition { false };
-    AutocapitalizeType autocapitalizeType { AutocapitalizeTypeDefault };
+    WebCore::AutocapitalizeType autocapitalizeType { WebCore::AutocapitalizeType::Default };
     InputType elementType { InputType::None };
     WebCore::InputMode inputMode { WebCore::InputMode::Unspecified };
     WebCore::EnterKeyHint enterKeyHint { WebCore::EnterKeyHint::Unspecified };
@@ -153,4 +153,4 @@ struct FocusedElementInformation {
 };
 #endif
 
-}
+} // namespace WebKit
diff --git a/Source/WebKit/Shared/glib/InputMethodState.cpp b/Source/WebKit/Shared/glib/InputMethodState.cpp
@@ -83,21 +83,21 @@ void InputMethodState::setPurposeForInputElement(WebCore::HTMLInputElement& elem
         purpose = Purpose::Digits;
 }
 
-void InputMethodState::addHintsForAutocapitalizeType(AutocapitalizeType autocapitalizeType)
+void InputMethodState::addHintsForAutocapitalizeType(WebCore::AutocapitalizeType autocapitalizeType)
 {
     switch (autocapitalizeType) {
-    case AutocapitalizeTypeDefault:
+    case WebCore::AutocapitalizeType::Default:
         break;
-    case AutocapitalizeTypeNone:
+    case WebCore::AutocapitalizeType::None:
         hints.add(InputMethodState::Hint::Lowercase);
         break;
-    case AutocapitalizeTypeWords:
+    case WebCore::AutocapitalizeType::Words:
         hints.add(InputMethodState::Hint::UppercaseWords);
         break;
-    case AutocapitalizeTypeSentences:
+    case WebCore::AutocapitalizeType::Sentences:
         hints.add(InputMethodState::Hint::UppercaseSentences);
         break;
-    case AutocapitalizeTypeAllCharacters:
+    case WebCore::AutocapitalizeType::AllCharacters:
         hints.add(InputMethodState::Hint::UppercaseChars);
         break;
     }

diff --git a/Source/WebKit/Shared/glib/InputMethodState.h b/Source/WebKit/Shared/glib/InputMethodState.h
@@ -64,7 +64,7 @@ struct InputMethodState {
 
     void setPurposeOrHintForInputMode(WebCore::InputMode);
     void setPurposeForInputElement(WebCore::HTMLInputElement&);
-    void addHintsForAutocapitalizeType(AutocapitalizeType);
+    void addHintsForAutocapitalizeType(WebCore::AutocapitalizeType);
 
     void encode(IPC::Encoder&) const;
     static Optional<InputMethodState> decode(IPC::Decoder&);

diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
@@ -4844,18 +4844,18 @@ - (BOOL)hasText
 
 // end of UITextInput protocol implementation
 
-static UITextAutocapitalizationType toUITextAutocapitalize(AutocapitalizeType webkitType)
+static UITextAutocapitalizationType toUITextAutocapitalize(WebCore::AutocapitalizeType webkitType)
 {
     switch (webkitType) {
-    case AutocapitalizeTypeDefault:
+    case WebCore::AutocapitalizeType::Default:
         return UITextAutocapitalizationTypeSentences;
-    case AutocapitalizeTypeNone:
+    case WebCore::AutocapitalizeType::None:
         return UITextAutocapitalizationTypeNone;
-    case AutocapitalizeTypeWords:
+    case WebCore::AutocapitalizeType::Words:
         return UITextAutocapitalizationTypeWords;
-    case AutocapitalizeTypeSentences:
+    case WebCore::AutocapitalizeType::Sentences:
         return UITextAutocapitalizationTypeSentences;
-    case AutocapitalizeTypeAllCharacters:
+    case WebCore::AutocapitalizeType::AllCharacters:
         return UITextAutocapitalizationTypeAllCharacters;
     }
 

diff --git a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
@@ -3226,13 +3226,13 @@ static void populateCaretContext(const HitTestResult& hitTestResult, const Inter
             information.shouldSynthesizeKeyEventsForEditing = focusedHTMLElement.document().settings().syntheticEditingCommandsEnabled();
         } else {
             information.isAutocorrect = true;
-            information.autocapitalizeType = AutocapitalizeTypeDefault;
+            information.autocapitalizeType = WebCore::AutocapitalizeType::Default;
         }
         information.isReadOnly = false;
     }
 
     if (focusedElement->document().quirks().shouldSuppressAutocorrectionAndAutocaptializationInHiddenEditableAreas() && isTransparentOrFullyClipped(*focusedElement)) {
-        information.autocapitalizeType = AutocapitalizeTypeNone;
+        information.autocapitalizeType = WebCore::AutocapitalizeType::None;
         information.isAutocorrect = false;
     }
 

diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
@@ -1,3 +1,19 @@
+2020-06-05  David Kilzer  <ddkilzer@apple.com>
+
+        [IPC] Adopt enum class for AutocapitalizeType
+        <https://webkit.org/b/212846>
+        <rdar://problem/64042825>
+
+        Reviewed by Darin Adler.
+
+        Summary:
+        - Move AutocapitalizeType into WebCore namespace.
+        - Convert AutocapitalizeType to an enum class.
+        - Add WTF::EnumTraits<AutocapitalizeType> for IPC.
+
+        * DOM/DOMHTML.mm:
+        (webAutocapitalizeType):
+
 2020-06-05  David Kilzer  <ddkilzer@apple.com>
 
         [IPC] Adopt enum class for PluginLoadClientPolicy

diff --git a/Source/WebKitLegacy/mac/DOM/DOMHTML.mm b/Source/WebKitLegacy/mac/DOM/DOMHTML.mm
@@ -221,18 +221,18 @@ - (BOOL)_isEdited
 
 @end
 
-static WebAutocapitalizeType webAutocapitalizeType(AutocapitalizeType type)
+static WebAutocapitalizeType webAutocapitalizeType(WebCore::AutocapitalizeType type)
 {
     switch (type) {
-    case AutocapitalizeTypeDefault:
+    case WebCore::AutocapitalizeType::Default:
         return WebAutocapitalizeTypeDefault;
-    case AutocapitalizeTypeNone:
+    case WebCore::AutocapitalizeType::None:
         return WebAutocapitalizeTypeNone;
-    case AutocapitalizeTypeWords:
+    case WebCore::AutocapitalizeType::Words:
         return WebAutocapitalizeTypeWords;
-    case AutocapitalizeTypeSentences:
+    case WebCore::AutocapitalizeType::Sentences:
         return WebAutocapitalizeTypeSentences;
-    case AutocapitalizeTypeAllCharacters:
+    case WebCore::AutocapitalizeType::AllCharacters:
         return WebAutocapitalizeTypeAllCharacters;
     }
 }