[iOS WebKit2] Disable screen font substitution by default.

<https://webkit.org/b/134266>
<rdar://problem/17427740>

Just like OS X >= 10.9, screen font substitution should be disabled
by default in WebKit2 for iOS.

Reviewed by Anders Carlsson.

* Shared/WebPreferencesDefinitions.h:

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

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 889aabb..f814e15 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2014-06-24  Andreas Kling  <akling@apple.com>
+
+        [iOS WebKit2] Disable screen font substitution by default.
+        <https://webkit.org/b/134266>
+        <rdar://problem/17427740>
+
+        Just like OS X >= 10.9, screen font substitution should be disabled
+        by default in WebKit2 for iOS.
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/WebPreferencesDefinitions.h:
+
 2014-06-24  Anders Carlsson  <andersca@apple.com>
 
         Add PageState to HistoryItem conversion code

diff --git a/Source/WebKit2/Shared/WebPreferencesDefinitions.h b/Source/WebKit2/Shared/WebPreferencesDefinitions.h
index 1b13f4a..24214bb 100644 (file)
--- a/Source/WebKit2/Shared/WebPreferencesDefinitions.h
+++ b/Source/WebKit2/Shared/WebPreferencesDefinitions.h
@@ -40,7 +40,7 @@
 #define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED false
 #endif
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
 #define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED false
 #else
 #define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED true