summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-25 01:49:02 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-25 01:49:02 +0000
commit787c5d2a1b92c5c764112a182af2566aa37aa35c (patch)
tree3add547ff3dcb0ea26cecb27ffc9cc0eabf2e436 /webkit/tools
parenta2b78edcb8d68cbd5cb4d0747ea0072a728ef122 (diff)
downloadchromium_src-787c5d2a1b92c5c764112a182af2566aa37aa35c.zip
chromium_src-787c5d2a1b92c5c764112a182af2566aa37aa35c.tar.gz
chromium_src-787c5d2a1b92c5c764112a182af2566aa37aa35c.tar.bz2
HIToolbox isn't available in 64 bit.
BUG=177744 TEST=more compilation Review URL: https://chromiumcodereview.appspot.com/12502019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_shell_platform_delegate_mac.mm9
1 files changed, 8 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell_platform_delegate_mac.mm b/webkit/tools/test_shell/test_shell_platform_delegate_mac.mm
index 5b2561a..dc1b221 100644
--- a/webkit/tools/test_shell/test_shell_platform_delegate_mac.mm
+++ b/webkit/tools/test_shell/test_shell_platform_delegate_mac.mm
@@ -26,6 +26,9 @@ static void SetDefaultsToLayoutTestValues(void) {
// (We want to do this as early as possible in application startup so
// the settings are in before any higher layers could cache values.)
+ // This is inspired by resetDefaultsToConsistentValues() in
+ // WebKit/Tools/DumpRenderTree/mac/DumpRenderTree.mm .
+
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
const NSInteger kMinFontSizeCGSmoothes = 4;
@@ -58,9 +61,13 @@ static void SetDefaultsToLayoutTestValues(void) {
kCFPreferencesAnyApplication,
kCFPreferencesCurrentUser,
kCFPreferencesAnyHost);
- // Make HIToolbox read from CFPreferences
+#ifndef __LP64__
+ // Make HIToolbox read from CFPreferences.
+ // HIToolbox is not available in 64-bit. DumpRenderTree comments out this
+ // call with a note to rdar://6347388 . No clue, sorry.
ThemeScrollBarArrowStyle style;
GetThemeScrollBarArrowStyle(&style);
+#endif // __LP64__
if (initialValue) {
// Reset the preference to what it was
CFPreferencesSetValue(CFSTR("AppleScrollBarVariant"),