Modified: trunk/Source/WebKit2/ChangeLog (126294 => 126295)
--- trunk/Source/WebKit2/ChangeLog 2012-08-22 13:12:17 UTC (rev 126294)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-22 13:12:26 UTC (rev 126295)
@@ -1,5 +1,18 @@
2012-08-22 Allan Sandfeld Jensen <[email protected]>
+ Wrong default for new ScrollAnimatorEnabled preference.
+
+ Reviewed by Simon Hausmann.
+
+ ScrollAnimatorEnabled introduced in r126291, should default to 'true'
+ to preserve existing behaviour on WK2 platforms that already enabled
+ SMOOTH_SCROLLING unconditionally.
+
+ * Shared/WebPreferencesStore.h:
+ (WebKit):
+
+2012-08-22 Allan Sandfeld Jensen <[email protected]>
+
Unreviewed, build fixup for r126291.
* Shared/WebPreferencesStore.h:
Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (126294 => 126295)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2012-08-22 13:12:17 UTC (rev 126294)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2012-08-22 13:12:26 UTC (rev 126295)
@@ -48,6 +48,12 @@
#define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED false
#endif
+#if ENABLE(SMOOTH_SCROLLING) && !PLATFORM(QT)
+#define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED true
+#else
+#define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED false
+#endif
+
#define FOR_EACH_WEBKIT_BOOL_PREFERENCE(macro) \
macro(_javascript_Enabled, _javascript_Enabled, Bool, bool, true) \
macro(LoadsImagesAutomatically, loadsImagesAutomatically, Bool, bool, true) \
@@ -119,7 +125,7 @@
macro(ArtificialPluginInitializationDelayEnabled, artificialPluginInitializationDelayEnabled, Bool, bool, false) \
macro(ScrollingPerformanceLoggingEnabled, scrollingPerformanceLoggingEnabled, Bool, bool, false) \
macro(ThirdPartyStorageBlockingEnabled, thirdPartyStorageBlockingEnabled, Bool, bool, false) \
- macro(ScrollAnimatorEnabled, scrollAnimatorEnabled, Bool, bool, false) \
+ macro(ScrollAnimatorEnabled, scrollAnimatorEnabled, Bool, bool, DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED) \
\
#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
