Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm - Issue 10633026: Merge 120629 - [chromium/mac] Unbreak smooth scrolling.

Side by Side 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 unified diff | 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 »

OLD	NEW
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 22 matching lines...) Expand all Loading...
33 void InjectedBundleController::platformInitialize()	33 void InjectedBundleController::platformInitialize()

34 {	34 {

35 // Set up user defaults.	35 // Set up user defaults.

36 NSMutableDictionary *argumentDomain = [[[NSUserDefaults standardUserDefaults ] volatileDomainForName:NSArgumentDomain] mutableCopy];	36 NSMutableDictionary *argumentDomain = [[[NSUserDefaults standardUserDefaults ] volatileDomainForName:NSArgumentDomain] mutableCopy];

37 if (!argumentDomain)	37 if (!argumentDomain)

38 argumentDomain = [[NSMutableDictionary alloc] init];	38 argumentDomain = [[NSMutableDictionary alloc] init];

39	39

40 NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:	40 NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:

41 [NSNumber numberWithInteger:4], @"AppleAntiAliasingT hreshold",	41 [NSNumber numberWithInteger:4], @"AppleAntiAliasingT hreshold",

42 [NSNumber numberWithInteger:0], @"AppleFontSmoothing ",	42 [NSNumber numberWithInteger:0], @"AppleFontSmoothing ",

43 #if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)	43 #if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) && !PLATFOR M(CHROMIUM)

44 [NSNumber numberWithBool:NO], @"NSScrollAnimationE nabled",	44 [NSNumber numberWithBool:NO], @"NSScrollAnimationE nabled",

45 #else	45 #else

46 [NSNumber numberWithBool:NO], @"AppleScrollAnimati onEnabled",	46 [NSNumber numberWithBool:NO], @"AppleScrollAnimati onEnabled",

47 #endif	47 #endif

48 [NSNumber numberWithBool:NO], @"NSOverlayScrollers Enabled",	48 [NSNumber numberWithBool:NO], @"NSOverlayScrollers Enabled",

49 @"Always", @"AppleShowScrollBar s",	49 @"Always", @"AppleShowScrollBar s",

50 nil];	50 nil];

51	51

52 [argumentDomain addEntriesFromDictionary:dict];	52 [argumentDomain addEntriesFromDictionary:dict];

53 [[NSUserDefaults standardUserDefaults] setVolatileDomain:argumentDomain forN ame:NSArgumentDomain];	53 [[NSUserDefaults standardUserDefaults] setVolatileDomain:argumentDomain forN ame:NSArgumentDomain];

54	54

55 [argumentDomain release];	55 [argumentDomain release];

56 }	56 }

57	57

58 } // namespace TestWebKitAPI	58 } // namespace TestWebKitAPI

OLD	NEW