diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/win/SystemInfo.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/win/SystemInfo.h')
| -rw-r--r-- | Source/WebCore/platform/win/SystemInfo.h | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/Source/WebCore/platform/win/SystemInfo.h b/Source/WebCore/platform/win/SystemInfo.h index 9f2c2a0..2631ace 100644 --- a/Source/WebCore/platform/win/SystemInfo.h +++ b/Source/WebCore/platform/win/SystemInfo.h @@ -26,9 +26,44 @@ #ifndef SystemInfo_h #define SystemInfo_h +#include <wtf/text/WTFString.h> + namespace WebCore { -bool isRunningOnVistaOrLater(); +// NOTE: Keep these in order so callers can do things like +// "if (windowsVersion() >= WindowsVista) ...". It's OK to change or add values, +// though. +enum WindowsVersion { + // CE-based versions + WindowsCE1 = 0, + WindowsCE2, + WindowsCE3, + WindowsCE4, + WindowsCE5, + WindowsCE6, + WindowsCE7, + // 3.x-based versions + Windows3_1, + // 9x-based versions + Windows95, + Windows98, + WindowsME, + // NT-based versions + WindowsNT3, + WindowsNT4, + Windows2000, + WindowsXP, + WindowsServer2003, + WindowsVista, + WindowsServer2008, + Windows7, +}; + +// If supplied, |major| and |minor| are set to the OSVERSIONINFO::dwMajorVersion +// and dwMinorVersion field values, respectively. +WindowsVersion windowsVersion(int* major = 0, int* minor = 0); + +String windowsVersionForUAString(); } // namespace WebCore |