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

Side by Side Diff: Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.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 unified diff | Download patch
« no previous file with comments | « Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 16 matching lines...) Expand all
27 27
28 #import <Foundation/Foundation.h> 28 #import <Foundation/Foundation.h>
29 29
30 namespace WTR { 30 namespace WTR {
31 31
32 void InjectedBundle::platformInitialize(WKTypeRef) 32 void InjectedBundle::platformInitialize(WKTypeRef)
33 { 33 {
34 NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys: 34 NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
35 [NSNumber numberWithInteger:4], @"AppleAntiAliasingThreshold", 35 [NSNumber numberWithInteger:4], @"AppleAntiAliasingThreshold",
36 [NSNumber numberWithInteger:0], @"AppleFontSmoothing", 36 [NSNumber numberWithInteger:0], @"AppleFontSmoothing",
37 #if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) 37 #if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) && !PLATFOR M(CHROMIUM)
38 [NSNumber numberWithBool:NO], @"NSScrollAnimationEnabled", 38 [NSNumber numberWithBool:NO], @"NSScrollAnimationEnabled",
39 #else 39 #else
40 [NSNumber numberWithBool:NO], @"AppleScrollAnimationEnabled", 40 [NSNumber numberWithBool:NO], @"AppleScrollAnimationEnabled",
41 #endif 41 #endif
42 [NSNumber numberWithBool:NO], @"NSOverlayScrollersEnabled", 42 [NSNumber numberWithBool:NO], @"NSOverlayScrollersEnabled",
43 @"Always", @"AppleShowScrollBars", 43 @"Always", @"AppleShowScrollBars",
44 [NSArray arrayWithObject:@"en"], @"AppleLanguages", 44 [NSArray arrayWithObject:@"en"], @"AppleLanguages",
45 nil]; 45 nil];
46 46
47 [[NSUserDefaults standardUserDefaults] setVolatileDomain:dict forName:NSArgu mentDomain]; 47 [[NSUserDefaults standardUserDefaults] setVolatileDomain:dict forName:NSArgu mentDomain];
48 } 48 }
49 49
50 } // namespace WTR 50 } // namespace WTR
OLDNEW
« no previous file with comments | « Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698