Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (173164 => 173165)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-09-01 23:15:27 UTC (rev 173164)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-09-02 00:12:06 UTC (rev 173165)
@@ -26,8 +26,6 @@
#ifndef WebPreferencesDefinitions_h
#define WebPreferencesDefinitions_h
-// macro(KeyUpper, KeyLower, TypeNameUpper, TypeName, DefaultValue)
-
#if PLATFORM(GTK)
#define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED true
#else
@@ -80,7 +78,7 @@
#define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED true
#endif
-#if PLATFORM(IOS) && PLATFORM(IOS_SIMULATOR)
+#if PLATFORM(IOS_SIMULATOR)
#define DEFAULT_ACCELERATED_DRAWING_ENABLED false
#define DEFAULT_CANVAS_USES_ACCELERATED_DRAWING false
#else
@@ -88,6 +86,8 @@
#define DEFAULT_CANVAS_USES_ACCELERATED_DRAWING true
#endif
+// macro(KeyUpper, KeyLower, TypeNameUpper, TypeName, DefaultValue)
+
#define FOR_EACH_WEBKIT_BOOL_PREFERENCE(macro) \
macro(_javascript_Enabled, _javascript_Enabled, Bool, bool, true) \
macro(_javascript_MarkupEnabled, _javascript_MarkupEnabled, Bool, bool, true) \
@@ -207,7 +207,6 @@
macro(LongMousePressEnabled, longMousePressEnabled, Bool, bool, false) \
#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
- macro(PDFScaleFactor, pdfScaleFactor, Double, double, 0) \
macro(IncrementalRenderingSuppressionTimeout, incrementalRenderingSuppressionTimeout, Double, double, 5) \
macro(MinimumFontSize, minimumFontSize, Double, double, 0) \
macro(MinimumLogicalFontSize, minimumLogicalFontSize, Double, double, 9) \
@@ -224,7 +223,6 @@
macro(LayoutFallbackWidth, layoutFallbackWidth, UInt32, uint32_t, 980) \
macro(DeviceWidth, deviceWidth, UInt32, uint32_t, 0) \
macro(DeviceHeight, deviceHeight, UInt32, uint32_t, 0) \
- macro(PDFDisplayMode, pdfDisplayMode, UInt32, uint32_t, 1) \
macro(EditableLinkBehavior, editableLinkBehavior, UInt32, uint32_t, WebCore::EditableLinkNeverLive) \
macro(InspectorAttachedHeight, inspectorAttachedHeight, UInt32, uint32_t, 300) \
macro(InspectorAttachedWidth, inspectorAttachedWidth, UInt32, uint32_t, 750) \