Title: [170401] tags/Safari-538.42.1/Source/WebKit2
- Revision
- 170401
- Author
- bshaf...@apple.com
- Date
- 2014-06-24 16:18:55 -0700 (Tue, 24 Jun 2014)
Log Message
Merged r170385. <rdar://problem/17427740>
Modified Paths
Diff
Modified: tags/Safari-538.42.1/Source/WebKit2/ChangeLog (170400 => 170401)
--- tags/Safari-538.42.1/Source/WebKit2/ChangeLog 2014-06-24 23:17:22 UTC (rev 170400)
+++ tags/Safari-538.42.1/Source/WebKit2/ChangeLog 2014-06-24 23:18:55 UTC (rev 170401)
@@ -1,3 +1,20 @@
+2014-06-24 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r170385
+
+ 2014-06-24 Andreas Kling <akl...@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-23 Lucas Forschler <lforsch...@apple.com>
Merge r170311
Modified: tags/Safari-538.42.1/Source/WebKit2/Shared/WebPreferencesDefinitions.h (170400 => 170401)
--- tags/Safari-538.42.1/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-06-24 23:17:22 UTC (rev 170400)
+++ tags/Safari-538.42.1/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-06-24 23:18:55 UTC (rev 170401)
@@ -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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
