Bug 687634 - Test for whiteImage status in gfxXlibNativeRenderer::Draw; r=roc
authorarno renevier <arno@renevier.net>
Tue, 20 Sep 2011 17:20:51 +0100
changeset 77201 89d8b2add33ff2e51a17cea95cecce66e18bf6a1
parent 77200 969aaa109a23e2f9a0fe3a4efa0642f67d938d88
child 77202 2ea7c7953cb86a2c1e853ee8113ae601aa2bdc1b
push id2007
push userbmo@edmorley.co.uk
push dateTue, 20 Sep 2011 16:21:28 +0000
treeherdermozilla-inbound@2ea7c7953cb8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs687634
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 687634 - Test for whiteImage status in gfxXlibNativeRenderer::Draw; r=roc
gfx/thebes/gfxXlibNativeRenderer.cpp
--- a/gfx/thebes/gfxXlibNativeRenderer.cpp
+++ b/gfx/thebes/gfxXlibNativeRenderer.cpp
@@ -599,17 +599,17 @@ gfxXlibNativeRenderer::Draw(gfxContext* 
     tmpCtx->SetDeviceColor(gfxRGBA(1.0, 1.0, 1.0));
     tmpCtx->SetOperator(gfxContext::OPERATOR_SOURCE);
     tmpCtx->Paint();
     DrawOntoTempSurface(tempXlibSurface, -drawingRect.TopLeft());
     nsRefPtr<gfxImageSurface> whiteImage =
         CopyXlibSurfaceToImage(tempXlibSurface, gfxASurface::ImageFormatRGB24);
   
     if (blackImage->CairoStatus() == CAIRO_STATUS_SUCCESS &&
-        blackImage->CairoStatus() == CAIRO_STATUS_SUCCESS) {
+        whiteImage->CairoStatus() == CAIRO_STATUS_SUCCESS) {
         gfxAlphaRecovery::Analysis analysis;
         if (!gfxAlphaRecovery::RecoverAlpha(blackImage, whiteImage,
                                             result ? &analysis : nsnull))
             return;
 
         ctx->SetSource(blackImage, offset);
 
         /* if the caller wants to retrieve the rendered image, put it into