Bug 901002 - Add Windows 8.1 to the OS list for gfx driver blacklisting. r=bas
authorBrian R. Bondy <netzen@gmail.com>
Fri, 13 Sep 2013 11:08:05 -0700
changeset 147033 ed0014600bc7473f9d5d251399ef09ba4e173624
parent 147032 7e2551feeddd8b15a7c03009638a5dbbd1f09fad
child 147034 c88b666cff54e59c9a99b84b0cb202fd9e7ab19a
push id25283
push userryanvm@gmail.com
push dateFri, 13 Sep 2013 20:07:11 +0000
treeherdermozilla-central@7dbdc0fbda87 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbas
bugs901002
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 901002 - Add Windows 8.1 to the OS list for gfx driver blacklisting. r=bas
gfx/thebes/gfxWindowsPlatform.h
widget/windows/GfxInfo.cpp
widget/xpwidgets/GfxDriverInfo.h
widget/xpwidgets/GfxInfoBase.cpp
--- a/gfx/thebes/gfxWindowsPlatform.h
+++ b/gfx/thebes/gfxWindowsPlatform.h
@@ -241,17 +241,18 @@ public:
     // OS version in 16.16 major/minor form
     // based on http://msdn.microsoft.com/en-us/library/ms724834(VS.85).aspx
     enum {
         kWindowsUnknown = 0,
         kWindowsXP = 0x50001,
         kWindowsServer2003 = 0x50002,
         kWindowsVista = 0x60000,
         kWindows7 = 0x60001,
-        kWindows8 = 0x60002
+        kWindows8 = 0x60002,
+        kWindows8_1 = 0x60003
     };
 
     static int32_t WindowsOSVersion(int32_t *aBuildNum = nullptr);
 
     static void GetDLLVersion(const PRUnichar *aDLLPath, nsAString& aVersion);
 
     // returns ClearType tuning information for each display
     static void GetCleartypeParams(nsTArray<ClearTypeParameterInfo>& aParams);
--- a/widget/windows/GfxInfo.cpp
+++ b/widget/windows/GfxInfo.cpp
@@ -753,16 +753,18 @@ WindowsVersionToOperatingSystem(int32_t 
     case gfxWindowsPlatform::kWindowsServer2003:
       return DRIVER_OS_WINDOWS_SERVER_2003;
     case gfxWindowsPlatform::kWindowsVista:
       return DRIVER_OS_WINDOWS_VISTA;
     case gfxWindowsPlatform::kWindows7:
       return DRIVER_OS_WINDOWS_7;
     case gfxWindowsPlatform::kWindows8:
       return DRIVER_OS_WINDOWS_8;
+    case gfxWindowsPlatform::kWindows8_1:
+      return DRIVER_OS_WINDOWS_8_1;
     case gfxWindowsPlatform::kWindowsUnknown:
     default:
       return DRIVER_OS_UNKNOWN;
     };
 }
 
 const nsTArray<GfxDriverInfo>&
 GfxInfo::GetGfxDriverInfo()
--- a/widget/xpwidgets/GfxDriverInfo.h
+++ b/widget/xpwidgets/GfxDriverInfo.h
@@ -30,16 +30,17 @@ namespace widget {
 
 enum OperatingSystem {
   DRIVER_OS_UNKNOWN = 0,
   DRIVER_OS_WINDOWS_XP,
   DRIVER_OS_WINDOWS_SERVER_2003,
   DRIVER_OS_WINDOWS_VISTA,
   DRIVER_OS_WINDOWS_7,
   DRIVER_OS_WINDOWS_8,
+  DRIVER_OS_WINDOWS_8_1,
   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
 };
--- a/widget/xpwidgets/GfxInfoBase.cpp
+++ b/widget/xpwidgets/GfxInfoBase.cpp
@@ -206,16 +206,18 @@ BlacklistOSToOperatingSystem(const nsASt
   else if (os == NS_LITERAL_STRING("WINNT 5.2"))
     return DRIVER_OS_WINDOWS_SERVER_2003;
   else if (os == NS_LITERAL_STRING("WINNT 6.0"))
     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("WINNT 6.3"))
+    return DRIVER_OS_WINDOWS_8_1;
   else if (os == NS_LITERAL_STRING("Linux"))
     return DRIVER_OS_LINUX;
   else if (os == NS_LITERAL_STRING("Darwin 9"))
     return DRIVER_OS_OS_X_10_5;
   else if (os == NS_LITERAL_STRING("Darwin 10"))
     return DRIVER_OS_OS_X_10_6;
   else if (os == NS_LITERAL_STRING("Darwin 11"))
     return DRIVER_OS_OS_X_10_7;