Bug 1648587 - Rename IntelHDGraphicsToHaswell to IntelHaswell. r=aosmond

IntelHDGraphicsToHaswell currently only includes Haswell and
not older hardware like IntelHDGraphicsToIvyBridge etc.

Differential Revision: https://phabricator.services.mozilla.com/D81185

widget/GfxDriverInfo.cpp

@@ -257,7 +257,7 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id) {
       APPEND_DEVICE(0x0126); /* IntelSandyBridge_6 */
       APPEND_DEVICE(0x010a); /* IntelSandyBridge_7 */
       break;
-    case DeviceFamily::IntelHDGraphicsToHaswell:
+    case DeviceFamily::IntelHaswell:
       APPEND_DEVICE(0x0402); /* IntelHaswell_GT1_1 */
       APPEND_DEVICE(0x0406); /* IntelHaswell_GT1_2 */
       APPEND_DEVICE(0x040A); /* IntelHaswell_GT1_3 */
@@ -804,7 +804,7 @@ const nsAString& GfxDriverInfo::GetDeviceVendor(DeviceFamily id) {
     case DeviceFamily::IntelGMAX4500HD:
     case DeviceFamily::IntelHDGraphicsToIvyBridge:
     case DeviceFamily::IntelHDGraphicsToSandyBridge:
-    case DeviceFamily::IntelHDGraphicsToHaswell:
+    case DeviceFamily::IntelHaswell:
     case DeviceFamily::IntelHD3000:
     case DeviceFamily::IntelHD520:
     case DeviceFamily::IntelMobileHDGraphics:

widget/GfxDriverInfo.h

@@ -178,7 +178,7 @@ enum class DeviceFamily : uint8_t {
   IntelGMAX4500HD,
   IntelHDGraphicsToIvyBridge,
   IntelHDGraphicsToSandyBridge,
-  IntelHDGraphicsToHaswell,
+  IntelHaswell,
   IntelHD3000,
   IntelHD520,
   IntelMobileHDGraphics,

widget/windows/GfxInfo.cpp

@@ -1457,7 +1457,7 @@ const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() {
      * 4578. See bug 1432610
      */
     APPEND_TO_DRIVER_BLOCKLIST2(OperatingSystem::Windows7,
-                                DeviceFamily::IntelHDGraphicsToHaswell,
+                                DeviceFamily::IntelHaswell,
                                 nsIGfxInfo::FEATURE_DIRECT2D,
                                 nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
                                 DRIVER_BUILD_ID_LESS_THAN_OR_EQUAL, 4578,