diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6fb8fab..9d82fb8 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix the spelling of ThreeDDarkDhasowColor and unwrap the ThemeType enums
+        https://bugs.webkit.org/show_bug.cgi?id=202887
+
+        Reviewed by Wenson Hsieh.
+
+        ThreeDDarkDhasowColor was misspelled, and one enum value per line please.
+
+        * platform/ThemeTypes.h:
+
 2019-10-12  Chris Dumez  <cdumez@apple.com>
 
         Add [ActiveDOMObject] to IDLs of ActiveDOMObjects
diff --git a/Source/WebCore/platform/ThemeTypes.h b/Source/WebCore/platform/ThemeTypes.h
index cb6fa36..061f393 100644
--- a/Source/WebCore/platform/ThemeTypes.h
+++ b/Source/WebCore/platform/ThemeTypes.h
@@ -29,22 +29,64 @@
 
 // Must follow CSSValueKeywords.in order
 enum ControlPart {
-    NoControlPart, CheckboxPart, RadioPart, PushButtonPart, SquareButtonPart, ButtonPart,
-    ButtonBevelPart, DefaultButtonPart, InnerSpinButtonPart, ListboxPart, ListItemPart,
-    MediaControlsBackgroundPart, MediaControlsDarkBarBackgroundPart, MediaControlsFullscreenBackgroundPart,
-    MediaControlsLightBarBackgroundPart, MediaCurrentTimePart, MediaEnterFullscreenButtonPart,
-    MediaExitFullscreenButtonPart, MediaFullScreenVolumeSliderPart,
-    MediaFullScreenVolumeSliderThumbPart, MediaMuteButtonPart, MediaOverlayPlayButtonPart,
-    MediaPlayButtonPart, MediaReturnToRealtimeButtonPart, MediaRewindButtonPart, MediaSeekBackButtonPart,
-    MediaSeekForwardButtonPart, MediaSliderPart, MediaSliderThumbPart, MediaTimeRemainingPart,
-    MediaToggleClosedCaptionsButtonPart, MediaVolumeSliderPart, MediaVolumeSliderContainerPart,
-    MediaVolumeSliderMuteButtonPart, MediaVolumeSliderThumbPart,
-    MenulistPart, MenulistButtonPart, MenulistTextPart, MenulistTextFieldPart, MeterPart, ProgressBarPart, ProgressBarValuePart,
-    SliderHorizontalPart, SliderVerticalPart, SliderThumbHorizontalPart,
-    SliderThumbVerticalPart, CaretPart, SearchFieldPart, SearchFieldDecorationPart,
-    SearchFieldResultsDecorationPart, SearchFieldResultsButtonPart,
-    SearchFieldCancelButtonPart, SnapshottedPluginOverlayPart, TextFieldPart,
-    RelevancyLevelIndicatorPart, ContinuousCapacityLevelIndicatorPart, DiscreteCapacityLevelIndicatorPart, RatingLevelIndicatorPart,
+    NoControlPart,
+    CheckboxPart,
+    RadioPart,
+    PushButtonPart,
+    SquareButtonPart,
+    ButtonPart,
+    ButtonBevelPart,
+    DefaultButtonPart,
+    InnerSpinButtonPart,
+    ListboxPart,
+    ListItemPart,
+    MediaControlsBackgroundPart,
+    MediaControlsDarkBarBackgroundPart,
+    MediaControlsFullscreenBackgroundPart,
+    MediaControlsLightBarBackgroundPart,
+    MediaCurrentTimePart,
+    MediaEnterFullscreenButtonPart,
+    MediaExitFullscreenButtonPart,
+    MediaFullScreenVolumeSliderPart,
+    MediaFullScreenVolumeSliderThumbPart,
+    MediaMuteButtonPart,
+    MediaOverlayPlayButtonPart,
+    MediaPlayButtonPart,
+    MediaReturnToRealtimeButtonPart,
+    MediaRewindButtonPart,
+    MediaSeekBackButtonPart,
+    MediaSeekForwardButtonPart,
+    MediaSliderPart,
+    MediaSliderThumbPart,
+    MediaTimeRemainingPart,
+    MediaToggleClosedCaptionsButtonPart,
+    MediaVolumeSliderPart,
+    MediaVolumeSliderContainerPart,
+    MediaVolumeSliderMuteButtonPart,
+    MediaVolumeSliderThumbPart,
+    MenulistPart,
+    MenulistButtonPart,
+    MenulistTextPart,
+    MenulistTextFieldPart,
+    MeterPart,
+    ProgressBarPart,
+    ProgressBarValuePart,
+    SliderHorizontalPart,
+    SliderVerticalPart,
+    SliderThumbHorizontalPart,
+    SliderThumbVerticalPart,
+    CaretPart,
+    SearchFieldPart,
+    SearchFieldDecorationPart,
+    SearchFieldResultsDecorationPart,
+    SearchFieldResultsButtonPart,
+    SearchFieldCancelButtonPart,
+    SnapshottedPluginOverlayPart,
+    TextFieldPart,
+    RelevancyLevelIndicatorPart,
+    ContinuousCapacityLevelIndicatorPart,
+    DiscreteCapacityLevelIndicatorPart,
+    RatingLevelIndicatorPart,
 #if ENABLE(SERVICE_CONTROLS)
     ImageControlsButtonPart,
 #endif
@@ -59,24 +101,58 @@
 #endif
     TextAreaPart,
 #if ENABLE(ATTACHMENT_ELEMENT)
-    AttachmentPart, BorderlessAttachmentPart,
+    AttachmentPart,
+    BorderlessAttachmentPart,
 #endif
     CapsLockIndicatorPart
 };
 
 enum SelectionPart {
-    SelectionBackground, SelectionForeground
+    SelectionBackground,
+    SelectionForeground
 };
 
 enum ThemeFont {
-    CaptionFont, IconFont, MenuFont, MessageBoxFont, SmallCaptionFont, StatusBarFont, MiniControlFont, SmallControlFont, ControlFont 
+    CaptionFont,
+    IconFont,
+    MenuFont,
+    MessageBoxFont,
+    SmallCaptionFont,
+    StatusBarFont,
+    MiniControlFont,
+    SmallControlFont,
+    ControlFont
 };
 
 enum ThemeColor {
-    ActiveBorderColor, ActiveCaptionColor, AppWorkspaceColor, BackgroundColor, ButtonFaceColor, ButtonHighlightColor, ButtonShadowColor,
-    ButtonTextColor, CaptionTextColor, GrayTextColor, HighlightColor, HighlightTextColor, InactiveBorderColor, InactiveCaptionColor,
-    InactiveCaptionTextColor, InfoBackgroundColor, InfoTextColor, MatchColor, MenuTextColor, ScrollbarColor, ThreeDDarkDhasowColor,
-    ThreeDFaceColor, ThreeDHighlightColor, ThreeDLightShadowColor, ThreeDShadowCLor, WindowColor, WindowFrameColor, WindowTextColor,
+    ActiveBorderColor,
+    ActiveCaptionColor,
+    AppWorkspaceColor,
+    BackgroundColor,
+    ButtonFaceColor,
+    ButtonHighlightColor,
+    ButtonShadowColor,
+    ButtonTextColor,
+    CaptionTextColor,
+    GrayTextColor,
+    HighlightColor,
+    HighlightTextColor,
+    InactiveBorderColor,
+    InactiveCaptionColor,
+    InactiveCaptionTextColor,
+    InfoBackgroundColor,
+    InfoTextColor,
+    MatchColor,
+    MenuTextColor,
+    ScrollbarColor,
+    ThreeDDarkShadowColor,
+    ThreeDFaceColor,
+    ThreeDHighlightColor,
+    ThreeDLightShadowColor,
+    ThreeDShadowColor,
+    WindowColor,
+    WindowFrameColor,
+    WindowTextColor,
     FocusRingColor
 };