Follow-on, fixing a bad merge from my last change.
authorbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Jan 2015 00:38:33 +0000 (00:38 +0000)
committerbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Jan 2015 00:38:33 +0000 (00:38 +0000)
* Shared/WebPreferencesDefinitions.h:

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

Source/WebKit2/ChangeLog
Source/WebKit2/Shared/WebPreferencesDefinitions.h

index 1490b8d..fb6665f 100644 (file)
@@ -1,5 +1,11 @@
 2015-01-29  Beth Dakin  <bdakin@apple.com>
 
+        Follow-on, fixing a bad merge from my last change. 
+
+        * Shared/WebPreferencesDefinitions.h:
+
+2015-01-29  Beth Dakin  <bdakin@apple.com>
+
         Remove more Mountain Lion code from WebKit2
         https://bugs.webkit.org/show_bug.cgi?id=141052
 
index a7d7627..0e3b567 100644 (file)
 #define DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED true
 #define DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED true
 #define DEFAULT_PDFPLUGIN_ENABLED true
-#define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED false
 #else
 #define DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED false
 #define DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED false
 #define DEFAULT_PDFPLUGIN_ENABLED false
-#define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED true
 #endif
 
 #if PLATFORM(IOS)