@@ -1945,30 +1945,29 @@ nsresult GfxInfo::GetFeatureStatusImpl(
1945
1945
!adapterVendorID.Equals (
1946
1946
GfxDriverInfo::GetDeviceVendor (DeviceVendor::Microsoft),
1947
1947
nsCaseInsensitiveStringComparator) &&
1948
+ !adapterVendorID.Equals (
1949
+ GfxDriverInfo::GetDeviceVendor (DeviceVendor::MicrosoftHyperV),
1950
+ nsCaseInsensitiveStringComparator) &&
1948
1951
!adapterVendorID.Equals (
1949
1952
GfxDriverInfo::GetDeviceVendor (DeviceVendor::Parallels),
1950
1953
nsCaseInsensitiveStringComparator) &&
1951
1954
!adapterVendorID.Equals (
1952
1955
GfxDriverInfo::GetDeviceVendor (DeviceVendor::Qualcomm),
1953
1956
nsCaseInsensitiveStringComparator) &&
1957
+ !adapterVendorID.Equals (
1958
+ GfxDriverInfo::GetDeviceVendor (DeviceVendor::VMWare),
1959
+ nsCaseInsensitiveStringComparator) &&
1960
+ !adapterVendorID.Equals (
1961
+ GfxDriverInfo::GetDeviceVendor (DeviceVendor::VirtualBox),
1962
+ nsCaseInsensitiveStringComparator) &&
1954
1963
// FIXME - these special hex values are currently used in xpcshell tests
1955
1964
// introduced by bug 625160 patch 8/8. Maybe these tests need to be
1956
1965
// adjusted now that we're only whitelisting intel/ati/nvidia.
1957
1966
!adapterVendorID.LowerCaseEqualsLiteral (" 0xabcd" ) &&
1958
1967
!adapterVendorID.LowerCaseEqualsLiteral (" 0xdcba" ) &&
1959
1968
!adapterVendorID.LowerCaseEqualsLiteral (" 0xabab" ) &&
1960
1969
!adapterVendorID.LowerCaseEqualsLiteral (" 0xdcdc" )) {
1961
- if (adapterVendorID.Equals (
1962
- GfxDriverInfo::GetDeviceVendor (DeviceVendor::MicrosoftHyperV),
1963
- nsCaseInsensitiveStringComparator) ||
1964
- adapterVendorID.Equals (
1965
- GfxDriverInfo::GetDeviceVendor (DeviceVendor::VMWare),
1966
- nsCaseInsensitiveStringComparator) ||
1967
- adapterVendorID.Equals (
1968
- GfxDriverInfo::GetDeviceVendor (DeviceVendor::VirtualBox),
1969
- nsCaseInsensitiveStringComparator)) {
1970
- aFailureId = " FEATURE_FAILURE_VM_VENDOR" ;
1971
- } else if (adapterVendorID.Equals (GfxDriverInfo::GetDeviceVendor (
1970
+ if (adapterVendorID.Equals (GfxDriverInfo::GetDeviceVendor (
1972
1971
DeviceVendor::MicrosoftBasic),
1973
1972
nsCaseInsensitiveStringComparator)) {
1974
1973
aFailureId = " FEATURE_FAILURE_MICROSOFT_BASIC_VENDOR" ;
0 commit comments