From fcbafd3b77f520fe6b9cd3b0002781c2f89a572f Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Fri, 28 Jan 2011 21:12:25 -0500 Subject: [PATCH 1/3] Bug 623338 - only whitelist Intel, NVIDIA, ATI - r=joe, a=blocking2.0 --- widget/src/windows/GfxInfo.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/widget/src/windows/GfxInfo.cpp b/widget/src/windows/GfxInfo.cpp index 2d89416931f..e439ffd66a3 100644 --- a/widget/src/windows/GfxInfo.cpp +++ b/widget/src/windows/GfxInfo.cpp @@ -722,6 +722,15 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature, PRInt32 *aStatus, nsAString & aS 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; From b1452f8f2c8c68c0bcb71f77dc6373ecfb844f0e Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Fri, 28 Jan 2011 21:12:25 -0500 Subject: [PATCH 2/3] Bug 628384 - Bypass graphics blacklist on reftest and mochitest - r+a=dbaron --- build/automation.py.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/automation.py.in b/build/automation.py.in index b292a67f63b..09f96879031 100644 --- a/build/automation.py.in +++ b/build/automation.py.in @@ -391,6 +391,11 @@ user_pref("extensions.update.url", "http://%(server)s/extensions-dummy/updateURL user_pref("extensions.blocklist.url", "http://%(server)s/extensions-dummy/blocklistURL"); // Make sure opening about:addons won't hit the network user_pref("extensions.webservice.discoverURL", "http://%(server)s/extensions-dummy/discoveryURL"); +// no graphics driver blacklist (test slaves currently have out of date drivers that we're +// otherwise going to blacklist) +user_pref("gfx.direct2d.force-enabled", true); +user_pref("layers.acceleration.force-enabled", true); +user_pref("webgl.force-enabled", true); """ % { "server" : self.webServer + ":" + str(self.httpPort) } prefs.append(part) From 6f7f30f6b69f91f16e53164d1afc38a7ca504f3f Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Fri, 28 Jan 2011 21:55:44 -0500 Subject: [PATCH 3/3] Backed out changeset 5bea893dd9b2 --- build/automation.py.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build/automation.py.in b/build/automation.py.in index 09f96879031..b292a67f63b 100644 --- a/build/automation.py.in +++ b/build/automation.py.in @@ -391,11 +391,6 @@ user_pref("extensions.update.url", "http://%(server)s/extensions-dummy/updateURL user_pref("extensions.blocklist.url", "http://%(server)s/extensions-dummy/blocklistURL"); // Make sure opening about:addons won't hit the network user_pref("extensions.webservice.discoverURL", "http://%(server)s/extensions-dummy/discoveryURL"); -// no graphics driver blacklist (test slaves currently have out of date drivers that we're -// otherwise going to blacklist) -user_pref("gfx.direct2d.force-enabled", true); -user_pref("layers.acceleration.force-enabled", true); -user_pref("webgl.force-enabled", true); """ % { "server" : self.webServer + ":" + str(self.httpPort) } prefs.append(part)