diff options
author | Steve Block <steveblock@google.com> | 2011-06-08 08:26:01 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-08 08:26:01 -0700 |
commit | 3742ac093d35d923c81693096ab6671e9b147700 (patch) | |
tree | c2add9100f789dad45ef1ec5328bddde02c47a4c /Source/WebCore/platform/win/SystemInfo.h | |
parent | 901401d90459bc22580842455d4588b9a697514d (diff) | |
parent | e5926f4a0d6adc9ad4a75824129f117181953560 (diff) | |
download | external_webkit-3742ac093d35d923c81693096ab6671e9b147700.zip external_webkit-3742ac093d35d923c81693096ab6671e9b147700.tar.gz external_webkit-3742ac093d35d923c81693096ab6671e9b147700.tar.bz2 |
Merge changes I55c6d71a,Ifb3277d4,Ia1b847a2,I7ba9cf3f,Ida2b2a8a,I1280ec90,I72f818d5,I2e3b588b,I9a4e6289,Ia724c78b,Icd8612c8,Ie31b15d7,Ie125edae,I77941a88,I89dae78b,I3516e5ca,I1a4c17b5,I2c4ecc1a,I9c8e6537,Ifac13115,Ie1f80e09,Ia541ed77,I60ce9d78
* changes:
Merge WebKit at r82507: Update ThirdPartyProject.prop
Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
Merge WebKit at r82507: Work around a V8 bug
Merge WebKit at r82507: JNIType renamed to JavaType
Merge WebKit at r82507: IconDatabaseClient interface expanded
Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
Merge WebKit at r82507: Node::isContentEditable() renamed
Merge WebKit at r82507: Use icon database through IconDatabaseBase
Merge WebKit at r82507: toInputElement() is now a member of Node
Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changed
Merge WebKit at r82507: StringImpl::computeHash() removed
Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()
Merge WebKit at r82507: Path::strokeBoundingRect() is now const
Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCacheGroup.cpp
Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
Merge WebKit at r82507: Fix conflicts due to JNI refactoring
Merge WebKit at r82507: Fix conflicts due to new StorageTracker
Merge WebKit at r82507: Fix conflicts
Merge WebKit at r82507: Fix makefiles
Merge WebKit at r82507: Initial merge by git
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 |