Fix asserts which were broken in bug 946532, which was r=mattwoodrow,dvander btw

This commit is contained in:
Nicholas Cameron 2013-12-09 10:31:13 +13:00
parent 1f1e8370e8
commit 82ad1038a7

View File

@ -3514,8 +3514,8 @@ mozilla::TemporaryRef<mozilla::gfx::DrawTarget>
nsWindow::StartRemoteDrawing()
{
MOZ_ASSERT(!mCompositeDC);
NS_ASSERTION(IsRenderMode(gfxWindowsPlatform::RENDER_DIRECT2D)) ||
IsRenderMode(gfxWindowsPlatform::RENDER_GDI)),
NS_ASSERTION(IsRenderMode(gfxWindowsPlatform::RENDER_DIRECT2D) ||
IsRenderMode(gfxWindowsPlatform::RENDER_GDI),
"Unexpected render mode for remote drawing");
HDC dc = (HDC)GetNativeData(NS_NATIVE_GRAPHIC);
@ -3557,7 +3557,7 @@ void
nsWindow::EndRemoteDrawing()
{
if (mTransparencyMode == eTransparencyTransparent) {
MOZ_ASSERT(IsRenderMode(gfxWindowsPlatform::RENDER_DIRECT2D))
MOZ_ASSERT(IsRenderMode(gfxWindowsPlatform::RENDER_DIRECT2D)
|| mTransparentSurface);
UpdateTranslucentWindow();
}