b=383960, moz cairo: fix up compilation with in-tree pixman

gfx/cairo/cairo/src/Makefile.in

@@ -81,6 +81,7 @@ CSRCS   = \
         cairo-debug.c \
         cairo-deflate-stream.c \
         cairo-fixed.c \
+	cairo-font-face.c \
         cairo-font-options.c \
         cairo-freelist.c \
         cairo-gstate.c \
@@ -197,3 +198,7 @@ DEFINES += -DPACKAGE_VERSION="\"moz\"" -DPACKAGE_BUGREPORT="\"http://bugzilla.mo
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 DEFINES += -DCAIRO_WIN32_STATIC_BUILD
 endif
+
+ifdef MOZ_TREE_CAIRO
+DEFINES += -DMOZ_TREE_CAIRO
+endif

gfx/cairo/cairo/src/cairo-mutex-type-private.h

@@ -49,6 +49,9 @@
 
 CAIRO_BEGIN_DECLS
 
+#ifndef MOZILLA_CAIRO_NOT_DEFINED
+#define CAIRO_NO_MUTEX 1
+#endif
 
 /* A fully qualified no-operation statement */
 #define CAIRO_MUTEX_NOOP	do {/*no-op*/} while (0)

gfx/cairo/cairo/src/cairo-region-private.h

@@ -37,7 +37,11 @@
 #ifndef CAIRO_REGION_PRIVATE_H
 #define CAIRO_REGION_PRIVATE_H
 
+#ifdef MOZ_TREE_CAIRO
+#include "pixman.h"
+#else
 #include <pixman/pixman.h>
+#endif
 
 /* cairo_region_t is defined in cairoint.h */
 

gfx/cairo/cairo/src/cairoint.h

@@ -64,7 +64,11 @@
 #include <stdio.h>
 
 #include "cairo.h"
+#ifdef MOZ_TREE_CAIRO
+#include "pixman.h"
+#else
 #include <pixman/pixman.h>
+#endif
 
 #ifdef _MSC_VER
 #define snprintf _snprintf