diff --git a/widget/cocoa/GfxInfo.mm b/widget/cocoa/GfxInfo.mm index 6081bb108d7..1b01ddbcb10 100644 --- a/widget/cocoa/GfxInfo.mm +++ b/widget/cocoa/GfxInfo.mm @@ -30,6 +30,7 @@ #define MAC_OS_X_VERSION_10_5_HEX 0x00001050 #define MAC_OS_X_VERSION_10_6_HEX 0x00001060 #define MAC_OS_X_VERSION_10_7_HEX 0x00001070 +#define MAC_OS_X_VERSION_10_8_HEX 0x00001080 using namespace mozilla; using namespace mozilla::widget; @@ -52,6 +53,8 @@ OSXVersionToOperatingSystem(uint32_t aOSXVersion) return DRIVER_OS_OS_X_10_6; case MAC_OS_X_VERSION_10_7_HEX: return DRIVER_OS_OS_X_10_7; + case MAC_OS_X_VERSION_10_8_HEX: + return DRIVER_OS_OS_X_10_8; } return DRIVER_OS_UNKNOWN; diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp index 97db474c06a..27a641703cb 100644 --- a/widget/windows/GfxInfo.cpp +++ b/widget/windows/GfxInfo.cpp @@ -717,6 +717,8 @@ WindowsVersionToOperatingSystem(int32_t aWindowsVersion) return DRIVER_OS_WINDOWS_VISTA; case gfxWindowsPlatform::kWindows7: return DRIVER_OS_WINDOWS_7; + case gfxWindowsPlatform::kWindows8: + return DRIVER_OS_WINDOWS_8; case gfxWindowsPlatform::kWindowsUnknown: default: return DRIVER_OS_UNKNOWN; diff --git a/widget/xpwidgets/GfxDriverInfo.h b/widget/xpwidgets/GfxDriverInfo.h index 421840967d3..7abd907d4a7 100644 --- a/widget/xpwidgets/GfxDriverInfo.h +++ b/widget/xpwidgets/GfxDriverInfo.h @@ -26,10 +26,12 @@ enum OperatingSystem { DRIVER_OS_WINDOWS_SERVER_2003, DRIVER_OS_WINDOWS_VISTA, DRIVER_OS_WINDOWS_7, + DRIVER_OS_WINDOWS_8, DRIVER_OS_LINUX, DRIVER_OS_OS_X_10_5, DRIVER_OS_OS_X_10_6, DRIVER_OS_OS_X_10_7, + DRIVER_OS_OS_X_10_8, DRIVER_OS_ANDROID, DRIVER_OS_ALL }; diff --git a/widget/xpwidgets/GfxInfoBase.cpp b/widget/xpwidgets/GfxInfoBase.cpp index cf061b6df40..ef386897e96 100644 --- a/widget/xpwidgets/GfxInfoBase.cpp +++ b/widget/xpwidgets/GfxInfoBase.cpp @@ -204,6 +204,8 @@ BlacklistOSToOperatingSystem(const nsAString& os) return DRIVER_OS_WINDOWS_VISTA; else if (os == NS_LITERAL_STRING("WINNT 6.1")) return DRIVER_OS_WINDOWS_7; + else if (os == NS_LITERAL_STRING("WINNT 6.2")) + return DRIVER_OS_WINDOWS_8; else if (os == NS_LITERAL_STRING("Linux")) return DRIVER_OS_LINUX; else if (os == NS_LITERAL_STRING("Darwin 9")) @@ -212,6 +214,8 @@ BlacklistOSToOperatingSystem(const nsAString& os) return DRIVER_OS_OS_X_10_6; else if (os == NS_LITERAL_STRING("Darwin 11")) return DRIVER_OS_OS_X_10_7; + else if (os == NS_LITERAL_STRING("Darwin 12")) + return DRIVER_OS_OS_X_10_8; else if (os == NS_LITERAL_STRING("Android")) return DRIVER_OS_ANDROID; else if (os == NS_LITERAL_STRING("All"))