Bug 1031267 - Fix --enable-system-cairo builds after they were broken by bug 1027763. r=jwatt
☠☠ backed out by 38e0566bb94b ☠ ☠
authorJan Beich <jbeich@vfemail.net>
Fri, 27 Jun 2014 16:29:17 +0100
changeset 191246 a7ea536288e0505ce69326996d4d268306076fc6
parent 191245 aeb88c96da926085ab15d3f893a83753cd85c6b2
child 191247 3704704cde6a052ae1fee4136660411705c22f99
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersjwatt
bugs1031267, 1027763
milestone33.0a1
Bug 1031267 - Fix --enable-system-cairo builds after they were broken by bug 1027763. r=jwatt
gfx/2d/DrawTargetCairo.cpp
--- a/gfx/2d/DrawTargetCairo.cpp
+++ b/gfx/2d/DrawTargetCairo.cpp
@@ -408,17 +408,19 @@ DrawTargetCairo::GetType() const
     case CAIRO_SURFACE_TYPE_WIN32:
     case CAIRO_SURFACE_TYPE_BEOS:
     case CAIRO_SURFACE_TYPE_OS2:
     case CAIRO_SURFACE_TYPE_QUARTZ_IMAGE:
     case CAIRO_SURFACE_TYPE_SCRIPT:
     case CAIRO_SURFACE_TYPE_RECORDING:
     case CAIRO_SURFACE_TYPE_DRM:
     case CAIRO_SURFACE_TYPE_SUBSURFACE:
+#ifdef CAIRO_HAS_D2D_SURFACE
     case CAIRO_SURFACE_TYPE_D2D:
+#endif
     case CAIRO_SURFACE_TYPE_TEE: // included to silence warning about unhandled enum value
       return DrawTargetType::SOFTWARE_RASTER;
     }
   }
   MOZ_ASSERT(false, "Could not determine DrawTargetType for DrawTargetCairo");
   return DrawTargetType::SOFTWARE_RASTER;
 }