more backouts

gfx/cairo/cairo/src/cairo-rename.h

@@ -35,7 +35,6 @@
 #define cairo_fill_preserve _moz_cairo_fill_preserve
 #define cairo_font_extents _moz_cairo_font_extents
 #define cairo_font_face_destroy _moz_cairo_font_face_destroy
-#define cairo_font_face_get_reference_count _moz_cairo_font_face_get_reference_count
 #define cairo_font_face_get_type _moz_cairo_font_face_get_type
 #define cairo_font_face_get_user_data _moz_cairo_font_face_get_user_data
 #define cairo_font_face_reference _moz_cairo_font_face_reference
@@ -76,12 +75,9 @@
 #define cairo_get_matrix _moz_cairo_get_matrix
 #define cairo_get_miter_limit _moz_cairo_get_miter_limit
 #define cairo_get_operator _moz_cairo_get_operator
-#define cairo_get_reference_count _moz_cairo_get_reference_count
-#define cairo_get_scaled_font _moz_cairo_get_scaled_font
 #define cairo_get_source _moz_cairo_get_source
 #define cairo_get_target _moz_cairo_get_target
 #define cairo_get_tolerance _moz_cairo_get_tolerance
-#define cairo_get_user_data _moz_cairo_get_user_data
 #define cairo_glitz_surface_create _moz_cairo_glitz_surface_create
 #define cairo_glyph_extents _moz_cairo_glyph_extents
 #define cairo_glyph_path _moz_cairo_glyph_path
@@ -109,12 +105,17 @@
 #define cairo_matrix_multiply _moz_cairo_matrix_multiply
 #define cairo_matrix_rotate _moz_cairo_matrix_rotate
 #define cairo_matrix_scale _moz_cairo_matrix_scale
+#define cairo_matrix_transform_bounding_box _moz_cairo_matrix_transform_bounding_box
 #define cairo_matrix_transform_distance _moz_cairo_matrix_transform_distance
 #define cairo_matrix_transform_point _moz_cairo_matrix_transform_point
 #define cairo_matrix_translate _moz_cairo_matrix_translate
 #define cairo_move_to _moz_cairo_move_to
 #define cairo_new_path _moz_cairo_new_path
 #define cairo_new_sub_path _moz_cairo_new_sub_path
+#define cairo_nquartz_surface_create _moz_cairo_nquartz_surface_create
+#define cairo_nquartz_surface_create_for_agl_context _moz_cairo_nquartz_surface_create_for_agl_context
+#define cairo_nquartz_surface_create_for_cg_context _moz_cairo_nquartz_surface_create_for_cg_context
+#define cairo_nquartz_surface_get_cg_context _moz_cairo_nquartz_surface_get_cg_context
 #define cairo_os2_fini _moz_cairo_os2_fini
 #define cairo_os2_init _moz_cairo_os2_init
 #define cairo_os2_surface_create _moz_cairo_os2_surface_create
@@ -141,16 +142,13 @@
 #define cairo_pattern_get_linear_points _moz_cairo_pattern_get_linear_points
 #define cairo_pattern_get_matrix _moz_cairo_pattern_get_matrix
 #define cairo_pattern_get_radial_circles _moz_cairo_pattern_get_radial_circles
-#define cairo_pattern_get_reference_count _moz_cairo_pattern_get_reference_count
 #define cairo_pattern_get_rgba _moz_cairo_pattern_get_rgba
 #define cairo_pattern_get_surface _moz_cairo_pattern_get_surface
 #define cairo_pattern_get_type _moz_cairo_pattern_get_type
-#define cairo_pattern_get_user_data _moz_cairo_pattern_get_user_data
 #define cairo_pattern_reference _moz_cairo_pattern_reference
 #define cairo_pattern_set_extend _moz_cairo_pattern_set_extend
 #define cairo_pattern_set_filter _moz_cairo_pattern_set_filter
 #define cairo_pattern_set_matrix _moz_cairo_pattern_set_matrix
-#define cairo_pattern_set_user_data _moz_cairo_pattern_set_user_data
 #define cairo_pattern_status _moz_cairo_pattern_status
 #define cairo_pdf_surface_create _moz_cairo_pdf_surface_create
 #define cairo_pdf_surface_create_for_stream _moz_cairo_pdf_surface_create_for_stream
@@ -166,8 +164,6 @@
 #define cairo_push_group _moz_cairo_push_group
 #define cairo_push_group_with_content _moz_cairo_push_group_with_content
 #define cairo_quartz_surface_create _moz_cairo_quartz_surface_create
-#define cairo_quartz_surface_create_for_cg_context _moz_cairo_quartz_surface_create_for_cg_context
-#define cairo_quartz_surface_get_cg_context _moz_cairo_quartz_surface_get_cg_context
 #define cairo_rectangle _moz_cairo_rectangle
 #define cairo_rectangle_list_destroy _moz_cairo_rectangle_list_destroy
 #define cairo_reference _moz_cairo_reference
@@ -186,12 +182,9 @@
 #define cairo_scaled_font_get_font_face _moz_cairo_scaled_font_get_font_face
 #define cairo_scaled_font_get_font_matrix _moz_cairo_scaled_font_get_font_matrix
 #define cairo_scaled_font_get_font_options _moz_cairo_scaled_font_get_font_options
-#define cairo_scaled_font_get_reference_count _moz_cairo_scaled_font_get_reference_count
 #define cairo_scaled_font_get_type _moz_cairo_scaled_font_get_type
-#define cairo_scaled_font_get_user_data _moz_cairo_scaled_font_get_user_data
 #define cairo_scaled_font_glyph_extents _moz_cairo_scaled_font_glyph_extents
 #define cairo_scaled_font_reference _moz_cairo_scaled_font_reference
-#define cairo_scaled_font_set_user_data _moz_cairo_scaled_font_set_user_data
 #define cairo_scaled_font_status _moz_cairo_scaled_font_status
 #define cairo_scaled_font_text_extents _moz_cairo_scaled_font_text_extents
 #define cairo_select_font_face _moz_cairo_select_font_face
@@ -214,7 +207,6 @@
 #define cairo_set_source_rgba _moz_cairo_set_source_rgba
 #define cairo_set_source_surface _moz_cairo_set_source_surface
 #define cairo_set_tolerance _moz_cairo_set_tolerance
-#define cairo_set_user_data _moz_cairo_set_user_data
 #define cairo_show_glyphs _moz_cairo_show_glyphs
 #define cairo_show_page _moz_cairo_show_page
 #define cairo_show_text _moz_cairo_show_text
@@ -234,6 +226,7 @@
 #define cairo_surface_get_reference_count _moz_cairo_surface_get_reference_count
 #define cairo_surface_get_type _moz_cairo_surface_get_type
 #define cairo_surface_get_user_data _moz_cairo_surface_get_user_data
+#define cairo_surface_is_nquartz _moz_cairo_surface_is_nquartz
 #define cairo_surface_mark_dirty _moz_cairo_surface_mark_dirty
 #define cairo_surface_mark_dirty_rectangle _moz_cairo_surface_mark_dirty_rectangle
 #define cairo_surface_reference _moz_cairo_surface_reference

gfx/thebes/src/gfxASurface.cpp

@@ -50,7 +50,7 @@
 #include "gfxXlibSurface.h"
 #endif
 
-#ifdef CAIRO_HAS_QUARTZ_SURFACE
+#ifdef CAIRO_HAS_NQUARTZ_SURFACE
 #include "gfxQuartzSurface.h"
 #endif
 
@@ -139,8 +139,8 @@ gfxASurface::Wrap (cairo_surface_t *csurf)
         result = new gfxXlibSurface(csurf);
     }
 #endif
-#ifdef CAIRO_HAS_QUARTZ_SURFACE
-    else if (stype == CAIRO_SURFACE_TYPE_QUARTZ) {
+#ifdef CAIRO_HAS_NQUARTZ_SURFACE
+    else if (stype == CAIRO_SURFACE_TYPE_NQUARTZ) {
         result = new gfxQuartzSurface(csurf);
     }
 #endif