Bug 1238028: When D2D 1.0 is not allowed disable D2D completely when not using 1.1. r=jrmuizel
--- 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;
}