From f798a11702a779c742251631c0a6bf8f7cff9853 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Fri, 13 Sep 2013 11:08:05 -0700
Subject: [PATCH] Bug 901002 - Add Windows 8.1 to the OS list for gfx driver
 blacklisting. r=bas

---
 gfx/thebes/gfxWindowsPlatform.h  | 3 ++-
 widget/windows/GfxInfo.cpp       | 2 ++
 widget/xpwidgets/GfxDriverInfo.h | 1 +
 widget/xpwidgets/GfxInfoBase.cpp | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gfx/thebes/gfxWindowsPlatform.h b/gfx/thebes/gfxWindowsPlatform.h
index 8d1d5aac423..697b01878a0 100644
--- a/gfx/thebes/gfxWindowsPlatform.h
+++ b/gfx/thebes/gfxWindowsPlatform.h
@@ -246,7 +246,8 @@ public:
         kWindowsServer2003 = 0x50002,
         kWindowsVista = 0x60000,
         kWindows7 = 0x60001,
-        kWindows8 = 0x60002
+        kWindows8 = 0x60002,
+        kWindows8_1 = 0x60003
     };
 
     static int32_t WindowsOSVersion(int32_t *aBuildNum = nullptr);
diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp
index f11ff0f671a..c2b371676eb 100644
--- a/widget/windows/GfxInfo.cpp
+++ b/widget/windows/GfxInfo.cpp
@@ -758,6 +758,8 @@ WindowsVersionToOperatingSystem(int32_t aWindowsVersion)
       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;
diff --git a/widget/xpwidgets/GfxDriverInfo.h b/widget/xpwidgets/GfxDriverInfo.h
index 1f704ef1fac..784bf055354 100644
--- a/widget/xpwidgets/GfxDriverInfo.h
+++ b/widget/xpwidgets/GfxDriverInfo.h
@@ -35,6 +35,7 @@ enum OperatingSystem {
   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,
diff --git a/widget/xpwidgets/GfxInfoBase.cpp b/widget/xpwidgets/GfxInfoBase.cpp
index dd1227cd79b..0cd60fea490 100644
--- a/widget/xpwidgets/GfxInfoBase.cpp
+++ b/widget/xpwidgets/GfxInfoBase.cpp
@@ -211,6 +211,8 @@ BlacklistOSToOperatingSystem(const nsAString& os)
     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"))