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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm

Issue 10633026: Merge 120629 - [chromium/mac] Unbreak smooth scrolling. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
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 | « Tools/DumpRenderTree/mac/DumpRenderTree.mm ('k') | Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm
===================================================================
--- Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm (revision 120989)
+++ Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm (working copy)
@@ -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",
« no previous file with comments | « Tools/DumpRenderTree/mac/DumpRenderTree.mm ('k') | Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698