Another attempt to fix the iOS build following <https://trac.webkit.org/changeset...
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 Jan 2019 23:05:57 +0000 (23:05 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 Jan 2019 23:05:57 +0000 (23:05 +0000)
(https://bugs.webkit.org/show_bug.cgi?id=193583)

Only override RenderTheme::platformFocusRingColor() when building with ENABLE(FULL_KEYBOARD_ACCESS)
enabled.

* rendering/RenderThemeIOS.h:
* rendering/RenderThemeIOS.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240179 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderThemeIOS.h
Source/WebCore/rendering/RenderThemeIOS.mm

index 202fe0e..1e5c60d 100644 (file)
@@ -1,5 +1,16 @@
 2019-01-18  Daniel Bates  <dabates@apple.com>
 
+        Another attempt to fix the iOS build following <https://trac.webkit.org/changeset/240174>
+        (https://bugs.webkit.org/show_bug.cgi?id=193583)
+
+        Only override RenderTheme::platformFocusRingColor() when building with ENABLE(FULL_KEYBOARD_ACCESS)
+        enabled.
+
+        * rendering/RenderThemeIOS.h:
+        * rendering/RenderThemeIOS.mm:
+
+2019-01-18  Daniel Bates  <dabates@apple.com>
+
         Attempt to fix the iOS build following <https://trac.webkit.org/changeset/240174>
         (https://bugs.webkit.org/show_bug.cgi?id=193583)
 
index 39346c1..ed8927f 100644 (file)
@@ -113,7 +113,9 @@ protected:
 
     Color platformActiveSelectionBackgroundColor(OptionSet<StyleColor::Options>) const override;
     Color platformInactiveSelectionBackgroundColor(OptionSet<StyleColor::Options>) const override;
+#if ENABLE(FULL_KEYBOARD_ACCESS)
     Color platformFocusRingColor(OptionSet<StyleColor::Options>) const final;
+#endif
 
 #if ENABLE(TOUCH_EVENTS)
     Color platformTapHighlightColor() const override { return 0x4D1A1A1A; }
index 91fae06..3215dce 100644 (file)
@@ -1123,10 +1123,12 @@ Color RenderThemeIOS::platformInactiveSelectionBackgroundColor(OptionSet<StyleCo
     return Color::transparent;
 }
 
+#if ENABLE(FULL_KEYBOARD_ACCESS)
 Color RenderThemeIOS::platformFocusRingColor(OptionSet<StyleColor::Options>) const
 {
     return colorFromUIColor([PAL::getUIColorClass() keyboardFocusIndicatorColor]);
 }
+#endif
 
 bool RenderThemeIOS::shouldHaveSpinButton(const HTMLInputElement&) const
 {