Update for cairo-0.3.0 snapshot headers.

layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp

@@ -52,6 +52,9 @@
 #include "nsISVGCairoSurface.h"
 #include <gdk/gdkx.h>
 #include <cairo.h>
+extern "C" {
+#include <cairo-xlib.h>
+}
 
 /**
  * \addtogroup cairo_renderer Cairo Rendering Engine

layout/svg/renderer/src/cairo/nsSVGCairoGradient.cpp

@@ -79,10 +79,6 @@ CairoSetStops(cairo_pattern_t *aPattern, nsISVGGradient *aGrad)
     aGrad->GetStopColor(i, &rgba);
     aGrad->GetStopOpacity(i, &opacity);
 
-#ifdef DEBUG_tor
-    fprintf(stderr, "stop %f %08X opacity %f\n", offset, rgba, opacity);
-#endif
-
     cairo_pattern_add_color_stop(aPattern, offset,
                                  NS_GET_R(rgba)/255.0,
                                  NS_GET_G(rgba)/255.0,
@@ -155,10 +151,6 @@ CairoGradient(cairo_t *ctx, nsISVGGradient *aGrad, cairo_text_extents_t *extent)
       y2 = extent->y_bearing + extent->height;
     }
 
-#ifdef DEBUG_tor
-    printf("In CarioGradient: bbox (%f, %f, %f, %f)\n",
-           (float)x1, (float)x2, (float)y1, (float)y2);
-#endif
     cairo_matrix_set_affine(patternMatrix, x2 - x1, 0, 0, y2 - y1, x1, y1);
   } else {
     cairo_matrix_set_identity(patternMatrix);

layout/svg/renderer/src/cairo/nsSVGCairoPathGeometry.cpp

@@ -293,9 +293,6 @@ nsSVGCairoPathGeometry::Render(nsISVGRendererCanvas *canvas)
     if (fillType == nsISVGGeometrySource::PAINT_TYPE_SOLID_COLOR) {
       cairo_fill(ctx);
     } else {
-#ifdef DEBUG_tor
-      fprintf(stderr, "CAIRO FILL GRADIENT ************************\n");
-#endif
       nsCOMPtr<nsISVGGradient> aGrad;
       mSource->GetFillGradient(getter_AddRefs(aGrad));
 
@@ -323,9 +320,6 @@ nsSVGCairoPathGeometry::Render(nsISVGRendererCanvas *canvas)
     if (strokeType == nsISVGGeometrySource::PAINT_TYPE_SOLID_COLOR) {
       cairo_stroke(ctx);
     } else {
-#ifdef DEBUG_tor
-      fprintf(stderr, "CAIRO STROKE GRADIENT ************************\n");
-#endif
       nsCOMPtr<nsISVGGradient> aGrad;
       mSource->GetStrokeGradient(getter_AddRefs(aGrad));
 

layout/svg/renderer/src/cairo/nsSVGRendererCairo.cpp

@@ -39,8 +39,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <cairo.h>
-
 #include "nsCOMPtr.h"
 #include "nsISVGRenderer.h"
 #include "nsSVGCairoPathGeometry.h"