From a880c542f17aa2b51145d4f73610c802bdb3de70 Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Mon, 5 Aug 2013 22:00:48 -0400 Subject: [PATCH] Bug 901025 - Allow GDI rendering mode when OMTC is enabled. r=jimm --- widget/windows/winrt/FrameworkViewGfx.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/widget/windows/winrt/FrameworkViewGfx.cpp b/widget/windows/winrt/FrameworkViewGfx.cpp index a55e8945a9c8..69caa1b1e8ce 100644 --- a/widget/windows/winrt/FrameworkViewGfx.cpp +++ b/widget/windows/winrt/FrameworkViewGfx.cpp @@ -53,11 +53,14 @@ FrameworkView::Render(const nsIntRegion& aInvalidRegion) } } - if (IsRenderMode(gfxWindowsPlatform::RENDER_GDI) || - IsRenderMode(gfxWindowsPlatform::RENDER_IMAGE_STRETCH32) || - IsRenderMode(gfxWindowsPlatform::RENDER_IMAGE_STRETCH24)) { - NS_WARNING("Unsupported render mode, can't draw. Needs to be D2D."); - return false; + // If OMTC is not in use, then we only support D2D rendering + if (!mWidget->ShouldUseOffMainThreadCompositing()) { + if (IsRenderMode(gfxWindowsPlatform::RENDER_GDI) || + IsRenderMode(gfxWindowsPlatform::RENDER_IMAGE_STRETCH32) || + IsRenderMode(gfxWindowsPlatform::RENDER_IMAGE_STRETCH24)) { + NS_WARNING("Unsupported render mode, can't draw. Needs to be D2D."); + return false; + } } if (mWidget->GetTransparencyMode() != eTransparencyOpaque) {