Bug 718359 - remove useless SANITY_CHECKING_FEATURE and XCB_SURFACE_FEATURE. r=khuey
authorMark Capella <markcapella@twcny.rr.com>
Sat, 25 Feb 2012 22:01:09 +0100
changeset 87728 5dd8529c9346dc8769985ea31300f76172293ac3
parent 87727 bb55af76a3b907f23f232f30004ecf645dceb58d
child 87729 89fbc0fd6006c135d8cd003f72ba50dfad45bdfb
push id22143
push userphilringnalda@gmail.com
push dateSun, 26 Feb 2012 23:12:35 +0000
treeherdermozilla-central@b98fc24ac54b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs718359
milestone13.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 718359 - remove useless SANITY_CHECKING_FEATURE and XCB_SURFACE_FEATURE. r=khuey
configure.in
gfx/cairo/cairo/src/cairo-features.h.in
--- a/configure.in
+++ b/configure.in
@@ -8277,30 +8277,23 @@ if test "$MOZ_TREE_CAIRO"; then
     fi
     AC_SUBST(MOZ_ENABLE_CAIRO_FT)
     AC_SUBST(MOZ_ENABLE_DWRITE_FONT)
     AC_SUBST(MOZ_ENABLE_D2D_SURFACE)
     AC_SUBST(MOZ_ENABLE_D3D9_LAYER)
     AC_SUBST(MOZ_ENABLE_D3D10_LAYER)
     AC_SUBST(CAIRO_FT_CFLAGS)
 
-    if test "$MOZ_DEBUG"; then
-      SANITY_CHECKING_FEATURE="#define CAIRO_DO_SANITY_CHECKING 1"
-    else
-      SANITY_CHECKING_FEATURE="#undef CAIRO_DO_SANITY_CHECKING"
-    fi
-
     AC_SUBST(PS_SURFACE_FEATURE)
     AC_SUBST(PDF_SURFACE_FEATURE)
     AC_SUBST(SVG_SURFACE_FEATURE)
     AC_SUBST(XLIB_SURFACE_FEATURE)
     AC_SUBST(XLIB_XRENDER_SURFACE_FEATURE)
     AC_SUBST(QUARTZ_SURFACE_FEATURE)
     AC_SUBST(QUARTZ_IMAGE_SURFACE_FEATURE)
-    AC_SUBST(XCB_SURFACE_FEATURE)
     AC_SUBST(WIN32_SURFACE_FEATURE)
     AC_SUBST(OS2_SURFACE_FEATURE)
     AC_SUBST(DIRECTFB_SURFACE_FEATURE)
     AC_SUBST(FT_FONT_FEATURE)
     AC_SUBST(FC_FONT_FEATURE)
     AC_SUBST(WIN32_FONT_FEATURE)
     AC_SUBST(WIN32_DWRITE_FONT_FEATURE)
     AC_SUBST(WIN32_D2D_SURFACE_FEATURE)
--- a/gfx/cairo/cairo/src/cairo-features.h.in
+++ b/gfx/cairo/cairo/src/cairo-features.h.in
@@ -64,18 +64,16 @@
 @XLIB_SURFACE_FEATURE@
 
 @XLIB_XRENDER_SURFACE_FEATURE@
 
 @QUARTZ_SURFACE_FEATURE@
 
 @QUARTZ_IMAGE_SURFACE_FEATURE@
 
-@XCB_SURFACE_FEATURE@
-
 @WIN32_SURFACE_FEATURE@
 
 @OS2_SURFACE_FEATURE@
 
 @DIRECTFB_SURFACE_FEATURE@
 
 @QT_SURFACE_FEATURE@