Merge backout.
authorMounir Lamouri <mounir.lamouri@gmail.com>
Tue, 21 Sep 2010 00:58:26 +0200
changeset 54376 f4978004fda110ae7874899d8ef9bb64dc4b4618
parent 54374 2b4ecab1e93a0631ef8fa068cac48e8f0bb436aa (current diff)
parent 54375 90391c9bd38697fbd0a9b369a56ef720cd618d3f (diff)
child 54377 dd06023bddcd588b49bd9fec8c60218d34479935
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b7pre
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
Merge backout.
--- a/gfx/thebes/gfxASurface.cpp
+++ b/gfx/thebes/gfxASurface.cpp
@@ -60,17 +60,17 @@
 #include "gfxQuartzSurface.h"
 #include "gfxQuartzImageSurface.h"
 #endif
 
 #ifdef MOZ_DFB
 #include "gfxDirectFBSurface.h"
 #endif
 
-#ifdef CAIRO_HAS_QT_SURFACE && defined(MOZ_WIDGET_QT)
+#ifdef CAIRO_HAS_QT_SURFACE
 #include "gfxQPainterSurface.h"
 #endif
 
 #ifdef CAIRO_HAS_DDRAW_SURFACE
 #include "gfxDDrawSurface.h"
 #endif
 
 #include <stdio.h>
@@ -186,17 +186,17 @@ gfxASurface::Wrap (cairo_surface_t *csur
         result = new gfxQuartzImageSurface(csurf);
     }
 #endif
 #ifdef MOZ_DFB
     else if (stype == CAIRO_SURFACE_TYPE_DIRECTFB) {
         result = new gfxDirectFBSurface(csurf);
     }
 #endif
-#ifdef CAIRO_HAS_QT_SURFACE && defined(MOZ_WIDGET_QT)
+#ifdef CAIRO_HAS_QT_SURFACE
     else if (stype == CAIRO_SURFACE_TYPE_QT) {
         result = new gfxQPainterSurface(csurf);
     }
 #endif
 #ifdef CAIRO_HAS_DDRAW_SURFACE
     else if (stype == CAIRO_SURFACE_TYPE_DDRAW) {
         result = new gfxDDrawSurface(csurf);
     }