diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 15:40:38 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 15:40:38 +0000 |
| commit | 4cc015107e2fcc166da1d9d0debfa3e48f30192c (patch) | |
| tree | 92866130e7dec74b6b4ed60b143f864ad52147c0 /webkit | |
| parent | 3e9f7fc1bbd90e6e439180e9cedcc48dc7ac9924 (diff) | |
| download | chromium_src-4cc015107e2fcc166da1d9d0debfa3e48f30192c.zip chromium_src-4cc015107e2fcc166da1d9d0debfa3e48f30192c.tar.gz chromium_src-4cc015107e2fcc166da1d9d0debfa3e48f30192c.tar.bz2 | |
Fix for Sandboxed WebKit on OS X:
* Cache Gestalt's value since it opens files.
* Do a little cleanup in sys_info while I'm there and add a unit test.
* Label some methods as not being threadsafe on OSX/POSIX.
Review URL: http://codereview.chromium.org/27088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index c98c987..cd099b3 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -37,6 +37,7 @@ MSVC_POP_WARNING(); #include "base/file_version_info.h" #include "base/singleton.h" #include "base/string_util.h" +#include "base/sys_info.h" #include "skia/include/SkBitmap.h" #include "webkit/glue/event_conversion.h" #include "webkit/glue/glue_util.h" @@ -336,20 +337,9 @@ void BuildUserAgent(bool mimic_safari, std::string* result) { int32 os_major_version = 0; int32 os_minor_version = 0; int32 os_bugfix_version = 0; -#if defined(OS_WIN) - OSVERSIONINFO info = {0}; - info.dwOSVersionInfoSize = sizeof(info); - GetVersionEx(&info); - os_major_version = info.dwMajorVersion; - os_minor_version = info.dwMinorVersion; -#elif defined(OS_MACOSX) - Gestalt(gestaltSystemVersionMajor, - reinterpret_cast<SInt32*>(&os_major_version)); - Gestalt(gestaltSystemVersionMinor, - reinterpret_cast<SInt32*>(&os_minor_version)); - Gestalt(gestaltSystemVersionBugFix, - reinterpret_cast<SInt32*>(&os_bugfix_version)); -#endif + base::SysInfo::OperatingSystemVersionNumbers(&os_major_version, + &os_minor_version, + &os_bugfix_version); // Get the product name and version, and replace Safari's Version/X string // with it. This is done to expose our product name in a manner that is |