Diff
Modified: trunk/Source/WebCore/ChangeLog (120628 => 120629)
--- trunk/Source/WebCore/ChangeLog 2012-06-18 21:43:10 UTC (rev 120628)
+++ trunk/Source/WebCore/ChangeLog 2012-06-18 21:48:58 UTC (rev 120629)
@@ -1,3 +1,15 @@
+2012-06-18 Nico Weber <tha...@chromium.org>
+
+ [chromium/mac] Unbreak smooth scrolling.
+ https://bugs.webkit.org/show_bug.cgi?id=89327
+
+ Reviewed by Dimitri Glazkov.
+
+ Broken by Sam in r115589 / r115591.
+
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::scrollAnimationEnabledForSystem):
+
2012-06-18 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r120541, r120547, and r120548.
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (120628 => 120629)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2012-06-18 21:43:10 UTC (rev 120628)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2012-06-18 21:48:58 UTC (rev 120629)
@@ -635,7 +635,7 @@
static bool scrollAnimationEnabledForSystem()
{
-#if defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LION)
+#if defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LION) || PLATFORM(CHROMIUM)
return [[NSUserDefaults standardUserDefaults] boolForKey:@"AppleScrollAnimationEnabled"];
#else
return [[NSUserDefaults standardUserDefaults] boolForKey:@"NSScrollAnimationEnabled"];
Modified: trunk/Tools/ChangeLog (120628 => 120629)
--- trunk/Tools/ChangeLog 2012-06-18 21:43:10 UTC (rev 120628)
+++ trunk/Tools/ChangeLog 2012-06-18 21:48:58 UTC (rev 120629)
@@ -1,3 +1,19 @@
+2012-06-18 Nico Weber <tha...@chromium.org>
+
+ [chromium/mac] Unbreak smooth scrolling.
+ https://bugs.webkit.org/show_bug.cgi?id=89327
+
+ Reviewed by Dimitri Glazkov.
+
+ Broken by Sam in r115589 / r115591.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetDefaultsToConsistentValues):
+ * TestWebKitAPI/mac/InjectedBundleControllerMac.mm:
+ (TestWebKitAPI::InjectedBundleController::platformInitialize):
+ * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
+ (WTR::InjectedBundle::platformInitialize):
+
2012-06-18 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r120541, r120547, and r120548.
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (120628 => 120629)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2012-06-18 21:43:10 UTC (rev 120628)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2012-06-18 21:48:58 UTC (rev 120629)
@@ -590,7 +590,7 @@
#endif
-#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
+#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) && !PLATFORM(CHROMIUM)
[defaults setBool:NO forKey:@"NSScrollAnimationEnabled"];
#else
[defaults setBool:NO forKey:@"AppleScrollAnimationEnabled"];
Modified: trunk/Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm (120628 => 120629)
--- trunk/Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm 2012-06-18 21:43:10 UTC (rev 120628)
+++ trunk/Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm 2012-06-18 21:48:58 UTC (rev 120629)
@@ -40,7 +40,7 @@
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInteger:4], @"AppleAntiAliasingThreshold",
[NSNumber numberWithInteger:0], @"AppleFontSmoothing",
-#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
+#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) && !PLATFORM(CHROMIUM)
[NSNumber numberWithBool:NO], @"NSScrollAnimationEnabled",
#else
[NSNumber numberWithBool:NO], @"AppleScrollAnimationEnabled",
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm (120628 => 120629)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2012-06-18 21:43:10 UTC (rev 120628)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2012-06-18 21:48:58 UTC (rev 120629)
@@ -34,7 +34,7 @@
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInteger:4], @"AppleAntiAliasingThreshold",
[NSNumber numberWithInteger:0], @"AppleFontSmoothing",
-#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
+#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) && !PLATFORM(CHROMIUM)
[NSNumber numberWithBool:NO], @"NSScrollAnimationEnabled",
#else
[NSNumber numberWithBool:NO], @"AppleScrollAnimationEnabled",
