Backed out changeset a7ea536288e0 (bug 1031267) for bustage..
authorJonathan Watt <jwatt@jwatt.org>
Fri, 27 Jun 2014 16:58:36 +0100
changeset 191249 38e0566bb94b42650a396eda351678972a1d8e65
parent 191248 2491b84943e11813458e1685e89d32035a7b6973
child 191250 82c4c46374dda19b27ffaa0148404c4cde80b8a4
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs1031267
milestone33.0a1
backs outa7ea536288e0505ce69326996d4d268306076fc6
Backed out changeset a7ea536288e0 (bug 1031267) for bustage..
gfx/2d/DrawTargetCairo.cpp
--- a/gfx/2d/DrawTargetCairo.cpp
+++ b/gfx/2d/DrawTargetCairo.cpp
@@ -408,19 +408,17 @@ 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;
 }