Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Unified Diff: Source/WebCore/platform/mac/ScrollAnimatorMac.mm

Issue 10572004: Merge 120629 - [chromium/mac] Unbreak smooth scrolling. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Tools/DumpRenderTree/mac/DumpRenderTree.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/mac/ScrollAnimatorMac.mm
===================================================================
--- Source/WebCore/platform/mac/ScrollAnimatorMac.mm (revision 120629)
+++ Source/WebCore/platform/mac/ScrollAnimatorMac.mm (working copy)
@@ -591,7 +591,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"];
« no previous file with comments | « no previous file | Tools/DumpRenderTree/mac/DumpRenderTree.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698