more backouts
authorvladimir@pobox.com
Tue, 03 Apr 2007 12:43:13 -0700
changeset 302 443766494fd63286b463d81f100d97f2881891d0
parent 301 749ab10369bae79447192e303eb1571c5819347d
child 303 3c296cec1dbd1032e14db5f1f5a70323cdaf4642
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9a4pre
more backouts
gfx/cairo/cairo/src/cairo-rename.h
gfx/thebes/src/gfxASurface.cpp
--- a/gfx/cairo/cairo/src/cairo-rename.h
+++ b/gfx/cairo/cairo/src/cairo-rename.h
@@ -30,17 +30,16 @@
 #define cairo_device_to_user _moz_cairo_device_to_user
 #define cairo_device_to_user_distance _moz_cairo_device_to_user_distance
 #define cairo_directfb_surface_create _moz_cairo_directfb_surface_create
 #define cairo_fill _moz_cairo_fill
 #define cairo_fill_extents _moz_cairo_fill_extents
 #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
 #define cairo_font_face_set_user_data _moz_cairo_font_face_set_user_data
 #define cairo_font_face_status _moz_cairo_font_face_status
 #define cairo_font_options_copy _moz_cairo_font_options_copy
 #define cairo_font_options_create _moz_cairo_font_options_create
 #define cairo_font_options_destroy _moz_cairo_font_options_destroy
@@ -71,22 +70,19 @@
 #define cairo_get_font_options _moz_cairo_get_font_options
 #define cairo_get_group_target _moz_cairo_get_group_target
 #define cairo_get_line_cap _moz_cairo_get_line_cap
 #define cairo_get_line_join _moz_cairo_get_line_join
 #define cairo_get_line_width _moz_cairo_get_line_width
 #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
 #define cairo_identity_matrix _moz_cairo_identity_matrix
 #define cairo_image_surface_create _moz_cairo_image_surface_create
 #define cairo_image_surface_create_for_data _moz_cairo_image_surface_create_for_data
 #define cairo_image_surface_create_from_png _moz_cairo_image_surface_create_from_png
 #define cairo_image_surface_create_from_png_stream _moz_cairo_image_surface_create_from_png_stream
@@ -104,22 +100,27 @@
 #define cairo_matrix_init_identity _moz_cairo_matrix_init_identity
 #define cairo_matrix_init_rotate _moz_cairo_matrix_init_rotate
 #define cairo_matrix_init_scale _moz_cairo_matrix_init_scale
 #define cairo_matrix_init_translate _moz_cairo_matrix_init_translate
 #define cairo_matrix_invert _moz_cairo_matrix_invert
 #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
 #define cairo_os2_surface_get_manual_window_refresh _moz_cairo_os2_surface_get_manual_window_refresh
 #define cairo_os2_surface_refresh_window _moz_cairo_os2_surface_refresh_window
 #define cairo_os2_surface_set_hwnd _moz_cairo_os2_surface_set_hwnd
 #define cairo_os2_surface_set_manual_window_refresh _moz_cairo_os2_surface_set_manual_window_refresh
 #define cairo_os2_surface_set_size _moz_cairo_os2_surface_set_size
@@ -136,43 +137,38 @@
 #define cairo_pattern_destroy _moz_cairo_pattern_destroy
 #define cairo_pattern_get_color_stop_count _moz_cairo_pattern_get_color_stop_count
 #define cairo_pattern_get_color_stop_rgba _moz_cairo_pattern_get_color_stop_rgba
 #define cairo_pattern_get_extend _moz_cairo_pattern_get_extend
 #define cairo_pattern_get_filter _moz_cairo_pattern_get_filter
 #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
 #define cairo_pdf_surface_set_size _moz_cairo_pdf_surface_set_size
 #define cairo_pop_group _moz_cairo_pop_group
 #define cairo_pop_group_to_source _moz_cairo_pop_group_to_source
 #define cairo_ps_surface_create _moz_cairo_ps_surface_create
 #define cairo_ps_surface_create_for_stream _moz_cairo_ps_surface_create_for_stream
 #define cairo_ps_surface_dsc_begin_page_setup _moz_cairo_ps_surface_dsc_begin_page_setup
 #define cairo_ps_surface_dsc_begin_setup _moz_cairo_ps_surface_dsc_begin_setup
 #define cairo_ps_surface_dsc_comment _moz_cairo_ps_surface_dsc_comment
 #define cairo_ps_surface_set_size _moz_cairo_ps_surface_set_size
 #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
 #define cairo_rel_curve_to _moz_cairo_rel_curve_to
 #define cairo_rel_line_to _moz_cairo_rel_line_to
 #define cairo_rel_move_to _moz_cairo_rel_move_to
 #define cairo_reset_clip _moz_cairo_reset_clip
 #define cairo_restore _moz_cairo_restore
@@ -181,22 +177,19 @@
 #define cairo_scale _moz_cairo_scale
 #define cairo_scaled_font_create _moz_cairo_scaled_font_create
 #define cairo_scaled_font_destroy _moz_cairo_scaled_font_destroy
 #define cairo_scaled_font_extents _moz_cairo_scaled_font_extents
 #define cairo_scaled_font_get_ctm _moz_cairo_scaled_font_get_ctm
 #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
 #define cairo_set_antialias _moz_cairo_set_antialias
 #define cairo_set_dash _moz_cairo_set_dash
 #define cairo_set_fill_rule _moz_cairo_set_fill_rule
 #define cairo_set_font_face _moz_cairo_set_font_face
 #define cairo_set_font_matrix _moz_cairo_set_font_matrix
@@ -209,17 +202,16 @@
 #define cairo_set_miter_limit _moz_cairo_set_miter_limit
 #define cairo_set_operator _moz_cairo_set_operator
 #define cairo_set_scaled_font _moz_cairo_set_scaled_font
 #define cairo_set_source _moz_cairo_set_source
 #define cairo_set_source_rgb _moz_cairo_set_source_rgb
 #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
 #define cairo_status _moz_cairo_status
 #define cairo_status_to_string _moz_cairo_status_to_string
 #define cairo_stroke _moz_cairo_stroke
 #define cairo_stroke_extents _moz_cairo_stroke_extents
 #define cairo_stroke_preserve _moz_cairo_stroke_preserve
@@ -229,16 +221,17 @@
 #define cairo_surface_finish _moz_cairo_surface_finish
 #define cairo_surface_flush _moz_cairo_surface_flush
 #define cairo_surface_get_content _moz_cairo_surface_get_content
 #define cairo_surface_get_device_offset _moz_cairo_surface_get_device_offset
 #define cairo_surface_get_font_options _moz_cairo_surface_get_font_options
 #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
 #define cairo_surface_set_device_offset _moz_cairo_surface_set_device_offset
 #define cairo_surface_set_fallback_resolution _moz_cairo_surface_set_fallback_resolution
 #define cairo_surface_set_user_data _moz_cairo_surface_set_user_data
 #define cairo_surface_status _moz_cairo_surface_status
 #define cairo_surface_write_to_png _moz_cairo_surface_write_to_png
--- a/gfx/thebes/src/gfxASurface.cpp
+++ b/gfx/thebes/src/gfxASurface.cpp
@@ -45,17 +45,17 @@
 #ifdef CAIRO_HAS_WIN32_SURFACE
 #include "gfxWindowsSurface.h"
 #endif
 
 #ifdef CAIRO_HAS_XLIB_SURFACE
 #include "gfxXlibSurface.h"
 #endif
 
-#ifdef CAIRO_HAS_QUARTZ_SURFACE
+#ifdef CAIRO_HAS_NQUARTZ_SURFACE
 #include "gfxQuartzSurface.h"
 #endif
 
 #include <stdio.h>
 
 static cairo_user_data_key_t gfxasurface_pointer_key;
 
 // Surfaces use refcounting that's tied to the cairo surface refcnt, to avoid
@@ -134,18 +134,18 @@ gfxASurface::Wrap (cairo_surface_t *csur
         result = new gfxWindowsSurface(csurf);
     }
 #endif
 #ifdef CAIRO_HAS_XLIB_SURFACE
     else if (stype == CAIRO_SURFACE_TYPE_XLIB) {
         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
     else {
         result = new gfxUnknownSurface(csurf);
     }
 
     // fprintf(stderr, "New wrapper for %p -> %p\n", csurf, result);