Merge b2g-inbound to m-c a=merge
authorWes Kocher <wkocher@mozilla.com>
Tue, 01 Jul 2014 17:35:08 -0700
changeset 191781 7075808c330682f47f1bec7468767b0731c5c86a
parent 191780 66fb84cb15f8141f734186220de0157bd8d69fed (current diff)
parent 191728 48aef90168b0302cfa4f003e110e7c121338f9fb (diff)
child 191812 84131ac42e0e497b9fdf009a549fe33751886b98
child 191839 15188cb383b41dd8b2adb12a75bf09fcf8816b52
child 191851 d7a76117850e9e9cd8d9a47d9d3e3dc2e1b16285
push id27062
push userkwierso@gmail.com
push dateWed, 02 Jul 2014 00:35:27 +0000
treeherdermozilla-central@7075808c3306 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone33.0a1
first release with
nightly linux32
7075808c3306 / 33.0a1 / 20140702030201 / files
nightly linux64
7075808c3306 / 33.0a1 / 20140702030201 / files
nightly mac
7075808c3306 / 33.0a1 / 20140702030201 / files
nightly win32
7075808c3306 / 33.0a1 / 20140702030201 / files
nightly win64
7075808c3306 / 33.0a1 / 20140702030201 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge b2g-inbound to m-c a=merge
--- a/gfx/2d/DrawTargetCairo.cpp
+++ b/gfx/2d/DrawTargetCairo.cpp
@@ -447,19 +447,23 @@ 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;
+    default:
+      MOZ_CRASH("Unsupported cairo surface type");
     }
   }
   MOZ_ASSERT(false, "Could not determine DrawTargetType for DrawTargetCairo");
   return DrawTargetType::SOFTWARE_RASTER;
 }
 
 IntSize
 DrawTargetCairo::GetSize()