From 3a3e5b3c585d110766921a79997b4c6ab8a49440 Mon Sep 17 00:00:00 2001 From: "jeremy@chromium.org" Date: Fri, 21 Aug 2009 22:30:47 +0000 Subject: Some tweaks to the OS X Sandbox: * Fix 10.6 bug where garbled text was displayed due to insuccesful font loading. * Tightened down the Sandbox a bit, instead of allowing access to /System/Library limit it to certain subdirectories. * Remove unused warmup code now that we allow sysctl-read. BUG=11269 BUG=b/1853366 TEST=On 10.6, copy Arial.ttf from /System/Library/Fonts to ~/Library/Fonts , Launch Chrome. Text on NTP should be displayed normally and not garbled. Review URL: http://codereview.chromium.org/174254 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24030 0039d316-1c4b-4281-b951-d872f2087c98 --- base/sys_info_mac.cc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'base/sys_info_mac.cc') diff --git a/base/sys_info_mac.cc b/base/sys_info_mac.cc index caec74d..54b7320 100644 --- a/base/sys_info_mac.cc +++ b/base/sys_info_mac.cc @@ -12,21 +12,12 @@ namespace base { void SysInfo::OperatingSystemVersionNumbers(int32 *major_version, int32 *minor_version, int32 *bugfix_version) { - int32 major_version_cached = 0; - int32 minor_version_cached = 0; - int32 bugfix_version_cached = 0; - - // Gestalt can't be called in the sandbox, so we cache its return value. Gestalt(gestaltSystemVersionMajor, - reinterpret_cast(&major_version_cached)); + reinterpret_cast(major_version)); Gestalt(gestaltSystemVersionMinor, - reinterpret_cast(&minor_version_cached)); + reinterpret_cast(minor_version)); Gestalt(gestaltSystemVersionBugFix, - reinterpret_cast(&bugfix_version_cached)); - - *major_version = major_version_cached; - *minor_version = minor_version_cached; - *bugfix_version = bugfix_version_cached; + reinterpret_cast(bugfix_version)); } } // namespace base -- cgit v1.1