merge backout, r+a=bustage
authorBenoit Jacob <bjacob@mozilla.com>
Fri, 28 Jan 2011 22:33:01 -0500
changeset 61576 8e01633a1a7ddf1c164669778379955933530993
parent 61574 1783e5dc6f3acdbf3ef7ce93c3d93257f92ecd39 (current diff)
parent 61575 b88123213dfc880f6654668b76826dbb1eeb57e9 (diff)
child 61577 03c41bf59d8206bd4d3e3d355701ae6c28da7fd5
child 61610 2a7a03e4d6d80b1bb7029cabb79aa9f9072e5430
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b11pre
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
merge backout, r+a=bustage
widget/src/windows/GfxInfo.cpp
--- a/widget/src/windows/GfxInfo.cpp
+++ b/widget/src/windows/GfxInfo.cpp
@@ -691,25 +691,16 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aF
   nsAutoString adapterDriverVersionString;
   if (NS_FAILED(GetAdapterVendorID(&adapterVendor)) ||
       NS_FAILED(GetAdapterDeviceID(&adapterDeviceID)) ||
       NS_FAILED(GetAdapterDriverVersion(adapterDriverVersionString)))
   {
     return NS_ERROR_FAILURE;
   }
 
-  if (adapterVendor != vendorIntel &&
-      adapterVendor != vendorNVIDIA &&
-      adapterVendor != vendorAMD &&
-      adapterVendor != vendorATI)
-  {
-    *aStatus = FEATURE_BLOCKED_DEVICE;
-    return NS_OK;
-  }
-
   PRUint64 driverVersion;
   if (!ParseDriverVersion(adapterDriverVersionString, &driverVersion)) {
     return NS_ERROR_FAILURE;
   }
   
   PRUint64 suggestedDriverVersion = 0;
 
   if (aFeature == FEATURE_DIRECT3D_9_LAYERS &&