Bug 1238028: When D2D 1.0 is not allowed disable D2D completely when not using 1.1. r=jrmuizel draft
authorBas Schouten <bschouten@mozilla.com>
Mon, 11 Jan 2016 00:41:39 +0100
changeset 320359 2e49dcd71e2ebb61d201285123f677dd3e09f1d8
parent 320358 359f86fecbc2a6531d9018fb81a74fd26502f5a1
child 320511 d66812d35afe71699e4540e1d4433685b9612fdc
push id9175
push userbschouten@mozilla.com
push dateSun, 10 Jan 2016 23:41:58 +0000
reviewersjrmuizel
bugs1238028
milestone46.0a1
Bug 1238028: When D2D 1.0 is not allowed disable D2D completely when not using 1.1. r=jrmuizel
gfx/thebes/gfxWindowsPlatform.cpp
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -619,17 +619,17 @@ gfxWindowsPlatform::CreateDevice(RefPtr<
 
   return device ? S_OK : hr;
 }
 #endif
 
 void
 gfxWindowsPlatform::VerifyD2DDevice(bool aAttemptForce)
 {
-  if (!Factory::SupportsD2D1() && !gfxPrefs::Direct2DAllow1_0()) {
+  if ((!Factory::SupportsD2D1() || !gfxPrefs::Direct2DUse1_1()) && !gfxPrefs::Direct2DAllow1_0()) {
     return;
   }
 
 #ifdef CAIRO_HAS_D2D_SURFACE
     if (mD3D10Device) {
         if (SUCCEEDED(mD3D10Device->GetDeviceRemovedReason())) {
             return;
         }