Bug 693813 - Don't evaluate our blacklisting logic if we're being called for a downloaded blacklist entry. r=bjacob
authorJoe Drew <joe@drew.ca>
Tue, 11 Oct 2011 17:18:56 -0400
changeset 78619 f9fea4e143c6af1055987e8a022bb052b333935d
parent 78618 bc75b51a3b600ac737b6dc76efd09049dd7a4f9d
child 78620 82fd332d288a03f6a48b8e91a5d66a8784e482f9
push id21321
push usermak77@bonardo.net
push dateThu, 13 Oct 2011 13:50:30 +0000
treeherdermozilla-central@d6d3a1f90e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbjacob
bugs693813
milestone10.0a1
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
Bug 693813 - Don't evaluate our blacklisting logic if we're being called for a downloaded blacklist entry. r=bjacob
widget/src/xpwidgets/GfxInfoX11.cpp
--- a/widget/src/xpwidgets/GfxInfoX11.cpp
+++ b/widget/src/xpwidgets/GfxInfoX11.cpp
@@ -248,16 +248,22 @@ static inline PRUint64 version(PRUint32 
 
 nsresult
 GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature, PRInt32 *aStatus, nsAString & aSuggestedDriverVersion, GfxDriverInfo* aDriverInfo /* = nsnull */)
 {
     GetData();
     *aStatus = nsIGfxInfo::FEATURE_NO_INFO;
     aSuggestedDriverVersion.SetIsVoid(PR_TRUE);
 
+    if (aDriverInfo) {
+      // We don't implement the downloaded blacklist yet. Don't evaluate
+      // anything.
+      return NS_OK;
+    }
+
 #ifdef MOZ_PLATFORM_MAEMO
     // on Maemo, the glxtest probe doesn't build, and we don't really need GfxInfo anyway
     return NS_OK;
 #endif
 
     // Disable OpenGL layers when we don't have texture_from_pixmap because it regresses performance. 
     if (aFeature == nsIGfxInfo::FEATURE_OPENGL_LAYERS && !mHasTextureFromPixmap) {
         *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;