Bug 711656 - Fix bug in D2D blocklisting check - r=Bas, a=akeybl CLOS…

…ED TREE Two-fold bug: - d2dDisabled was set there, only to be overwritten below at line 432 - d2dBlocked was only set there for certain status values, should have been set for any status != NO_INFO. See https://bugzilla.mozilla.org/show_bug.cgi?id=711656#c85 --HG-- branch : COMM110_2012030910_RELBRANCH extra : transplant_source : %27%0CR%F5%E8%C2%2B%28L%0E%9E%90%B6%95%9A%60W%BF%7C%F8
mozilla · Mar 10, 2012 · 2d12d87 · 2d12d87
1 parent 7d99d80
commit 2d12d87
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -243,12 +243,7 @@ gfxWindowsPlatform::UpdateRenderMode()
         PRInt32 status;
         if (NS_SUCCEEDED(gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_DIRECT2D, &status))) {
             if (status != nsIGfxInfo::FEATURE_NO_INFO) {
-                d2dDisabled = true;
+                d2dBlocked = true;
-                if (status == nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION ||
-                    status == nsIGfxInfo::FEATURE_BLOCKED_DEVICE)
-                {
-                    d2dBlocked = true;
-                }
             }
         }
     }