resolved conflicts for merge of 2a049989 to master

Change-Id: Ia1cbb6b274e1b3739704de9dd997e6d5dc5185af

1 files changed, 24 insertions, 0 deletions

diff --git a/gm/system_preferences_mac.mm b/gm/system_preferences_mac.mm
new file mode 100644
index 0000000..2c772a1
--- /dev/null
+++ b/gm/system_preferences_mac.mm
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#import <Cocoa/Cocoa.h>
+
+void setSystemPreferences() {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    // Set LCD font smoothing level for this application (does not affect other
+    // applications). Based on resetDefaultsToConsistentValues() in
+    // http://trac.webkit.org/browser/trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm
+    static const int NoFontSmoothing     = 0;
+    static const int LightFontSmoothing  = 1;
+    static const int MediumFontSmoothing = 2;
+    static const int StrongFontSmoothing = 3;
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setInteger:MediumFontSmoothing forKey:@"AppleFontSmoothing"];
+
+    [pool release];
+}