mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-29 07:42:04 +00:00
Bug 1159273 - Update Cairo/Pixman renaming to not leak the symbols we use and silence linker warnings. r=jrmuizel
This commit is contained in:
Lee Salzman
Mike Hommey
parent
e38cad0b37
commit
c4fcd378b2
@ -14,11 +14,44 @@
|
||||
#define cairo_copy_path_flat _moz_cairo_copy_path_flat
|
||||
#define cairo_create _moz_cairo_create
|
||||
#define cairo_curve_to _moz_cairo_curve_to
|
||||
#define cairo_d2d_create_device _moz_cairo_d2d_create_device
|
||||
#define cairo_d2d_create_device_from_d3d10device _moz_cairo_d2d_create_device_from_d3d10device
|
||||
#define cairo_d2d_device_get_device _moz_cairo_d2d_device_get_device
|
||||
#define cairo_d2d_get_dc _moz_cairo_d2d_get_dc
|
||||
#define cairo_d2d_get_image_surface_cache_usage _moz_cairo_d2d_get_image_surface_cache_usage
|
||||
#define cairo_d2d_get_surface_vram_usage _moz_cairo_d2d_get_surface_vram_usage
|
||||
#define cairo_d2d_present_backbuffer _moz_cairo_d2d_present_backbuffer
|
||||
#define cairo_d2d_release_dc _moz_cairo_d2d_release_dc
|
||||
#define cairo_d2d_scroll _moz_cairo_d2d_scroll
|
||||
#define cairo_d2d_surface_create _moz_cairo_d2d_surface_create
|
||||
#define cairo_d2d_surface_create_for_handle _moz_cairo_d2d_surface_create_for_handle
|
||||
#define cairo_d2d_surface_create_for_hwnd _moz_cairo_d2d_surface_create_for_hwnd
|
||||
#define cairo_d2d_surface_create_for_texture _moz_cairo_d2d_surface_create_for_texture
|
||||
#define cairo_d2d_surface_get_height _moz_cairo_d2d_surface_get_height
|
||||
#define cairo_d2d_surface_get_texture _moz_cairo_d2d_surface_get_texture
|
||||
#define cairo_d2d_surface_get_width _moz_cairo_d2d_surface_get_width
|
||||
#define cairo_debug_reset_static_data _moz_cairo_debug_reset_static_data
|
||||
#define cairo_destroy _moz_cairo_destroy
|
||||
#define cairo_device_acquire _moz_cairo_device_acquire
|
||||
#define cairo_device_destroy _moz_cairo_device_destroy
|
||||
#define cairo_device_finish _moz_cairo_device_finish
|
||||
#define cairo_device_flush _moz_cairo_device_flush
|
||||
#define cairo_device_get_reference_count _moz_cairo_device_get_reference_count
|
||||
#define cairo_device_get_type _moz_cairo_device_get_type
|
||||
#define cairo_device_get_user_data _moz_cairo_device_get_user_data
|
||||
#define cairo_device_release _moz_cairo_device_release
|
||||
#define cairo_device_set_user_data _moz_cairo_device_set_user_data
|
||||
#define cairo_device_status _moz_cairo_device_status
|
||||
#define cairo_device_reference _moz_cairo_device_reference
|
||||
#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_dwrite_font_face_create_for_dwrite_fontface _moz_cairo_dwrite_font_face_create_for_dwrite_fontface
|
||||
#define cairo_dwrite_get_cleartype_rendering_mode _moz_cairo_dwrite_get_cleartype_rendering_mode
|
||||
#define cairo_dwrite_scaled_font_allow_manual_show_glyphs _moz_cairo_dwrite_scaled_font_allow_manual_show_glyphs
|
||||
#define cairo_dwrite_scaled_font_get_force_GDI_classic _moz_cairo_dwrite_scaled_font_get_force_GDI_classic
|
||||
#define cairo_dwrite_scaled_font_set_force_GDI_classic _moz_cairo_dwrite_scaled_font_set_force_GDI_classic
|
||||
#define cairo_dwrite_set_cleartype_params _moz_cairo_dwrite_set_cleartype_params
|
||||
#define cairo_fill _moz_cairo_fill
|
||||
#define cairo_fill_extents _moz_cairo_fill_extents
|
||||
#define cairo_fill_preserve _moz_cairo_fill_preserve
|
||||
@ -112,6 +145,7 @@
|
||||
#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_null_surface_create _moz_cairo_null_surface_create
|
||||
#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
|
||||
@ -215,9 +249,12 @@
|
||||
#define cairo_region_translate _moz_cairo_region_translate
|
||||
#define cairo_region_union _moz_cairo_region_union
|
||||
#define cairo_region_union_rectangle _moz_cairo_region_union_rectangle
|
||||
#define cairo_region_xor _moz_cairo_region_xor
|
||||
#define cairo_region_xor_rectangle _moz_cairo_region_xor_rectangle
|
||||
#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_release_device _moz_cairo_release_device
|
||||
#define cairo_reset_clip _moz_cairo_reset_clip
|
||||
#define cairo_restore _moz_cairo_restore
|
||||
#define cairo_rotate _moz_cairo_rotate
|
||||
@ -271,12 +308,16 @@
|
||||
#define cairo_stroke_extents _moz_cairo_stroke_extents
|
||||
#define cairo_stroke_preserve _moz_cairo_stroke_preserve
|
||||
#define cairo_stroke_to_path _moz_cairo_stroke_to_path
|
||||
#define cairo_surface_attach_snapshot _moz_cairo_surface_attach_snapshot
|
||||
#define cairo_surface_copy_page _moz_cairo_surface_copy_page
|
||||
#define cairo_surface_create_for_rectangle _moz_cairo_surface_create_for_rectangle
|
||||
#define cairo_surface_create_similar _moz_cairo_surface_create_similar
|
||||
#define cairo_surface_detach_snapshot _moz_cairo_surface_detach_snapshot
|
||||
#define cairo_surface_destroy _moz_cairo_surface_destroy
|
||||
#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 _moz_cairo_surface_get_device
|
||||
#define cairo_surface_get_device_offset _moz_cairo_surface_get_device_offset
|
||||
#define cairo_surface_get_fallback_resolution _moz_cairo_surface_get_fallback_resolution
|
||||
#define cairo_surface_get_font_options _moz_cairo_surface_get_font_options
|
||||
@ -330,6 +371,8 @@
|
||||
#define cairo_user_to_device_distance _moz_cairo_user_to_device_distance
|
||||
#define cairo_version _moz_cairo_version
|
||||
#define cairo_version_string _moz_cairo_version_string
|
||||
#define cairo_win32_get_dc_with_clip _moz_cairo_win32_get_dc_with_clip
|
||||
#define cairo_win32_get_system_text_quality _moz_cairo_win32_get_system_text_quality
|
||||
#define cairo_win32_font_face_create_for_hfont _moz_cairo_win32_font_face_create_for_hfont
|
||||
#define cairo_win32_font_face_create_for_logfontw _moz_cairo_win32_font_face_create_for_logfontw
|
||||
#define cairo_win32_font_face_create_for_logfontw_hfont _moz_cairo_win32_font_face_create_for_logfontw_hfont
|
||||
@ -340,11 +383,15 @@
|
||||
#define cairo_win32_scaled_font_get_metrics_factor _moz_cairo_win32_scaled_font_get_metrics_factor
|
||||
#define cairo_win32_scaled_font_select_font _moz_cairo_win32_scaled_font_select_font
|
||||
#define cairo_win32_surface_create _moz_cairo_win32_surface_create
|
||||
#define cairo_win32_surface_create_with_alpha _moz_cairo_win32_surface_create_with_alpha
|
||||
#define cairo_win32_surface_create_with_d3dsurface9 _moz_cairo_win32_surface_create_with_d3dsurface9
|
||||
#define cairo_win32_surface_create_with_ddb _moz_cairo_win32_surface_create_with_ddb
|
||||
#define cairo_win32_surface_create_with_dib _moz_cairo_win32_surface_create_with_dib
|
||||
#define cairo_win32_surface_get_dc _moz_cairo_win32_surface_get_dc
|
||||
#define cairo_win32_surface_get_height _moz_cairo_win32_surface_get_height
|
||||
#define cairo_win32_surface_get_image _moz_cairo_win32_surface_get_image
|
||||
#define cairo_win32_surface_get_width _moz_cairo_win32_surface_get_width
|
||||
#define cairo_win32_surface_set_can_convert_to_dib _moz_cairo_win32_surface_set_can_convert_to_dib
|
||||
#define cairo_xcb_surface_create _moz_cairo_xcb_surface_create
|
||||
#define cairo_xcb_surface_create_for_bitmap _moz_cairo_xcb_surface_create_for_bitmap
|
||||
#define cairo_xcb_surface_create_with_xrender_format _moz_cairo_xcb_surface_create_with_xrender_format
|
||||
@ -362,4 +409,3 @@
|
||||
#define cairo_xlib_surface_get_xrender_format _moz_cairo_xlib_surface_get_xrender_format
|
||||
#define cairo_xlib_surface_set_drawable _moz_cairo_xlib_surface_set_drawable
|
||||
#define cairo_xlib_surface_set_size _moz_cairo_xlib_surface_set_size
|
||||
#include "pixman-rename.h"
|
||||
|
||||
@ -1,4 +1,15 @@
|
||||
#ifdef MOZ_TREE_PIXMAN
|
||||
#define pixman_composite_glyphs _moz_pixman_composite_glyphs
|
||||
#define pixman_composite_glyphs_no_mask _moz_pixman_composite_glyphs_no_mask
|
||||
#define pixman_glyph_cache_create _moz_pixman_glyph_cache_create
|
||||
#define pixman_glyph_cache_destroy _moz_pixman_glyph_cache_destroy
|
||||
#define pixman_glyph_cache_freeze _moz_pixman_glyph_cache_freeze
|
||||
#define pixman_glyph_cache_insert _moz_pixman_glyph_cache_insert
|
||||
#define pixman_glyph_cache_lookup _moz_pixman_glyph_cache_lookup
|
||||
#define pixman_glyph_cache_remove _moz_pixman_glyph_cache_remove
|
||||
#define pixman_glyph_cache_thaw _moz_pixman_glyph_cache_thaw
|
||||
#define pixman_glyph_get_extents _moz_pixman_glyph_get_extents
|
||||
#define pixman_glyph_get_mask_format _moz_pixman_glyph_get_mask_format
|
||||
#define pixman_region_set_static_pointers _moz_pixman_region_set_static_pointers
|
||||
#define pixman_region_init _moz_pixman_region_init
|
||||
#define pixman_region_init_rect _moz_pixman_region_init_rect
|
||||
@ -21,6 +32,8 @@
|
||||
#define pixman_region_equal _moz_pixman_region_equal
|
||||
#define pixman_region_selfcheck _moz_pixman_region_selfcheck
|
||||
#define pixman_region_reset _moz_pixman_region_reset
|
||||
#define pixman_region_clear _moz_pixman_region_clear
|
||||
#define pixman_region_print _moz_pixman_region_print
|
||||
#define pixman_region32_init _moz_pixman_region32_init
|
||||
#define pixman_region32_init_rect _moz_pixman_region32_init_rect
|
||||
#define pixman_region32_init_rects _moz_pixman_region32_init_rects
|
||||
@ -45,6 +58,7 @@
|
||||
#define pixman_region32_selfcheck _moz_pixman_region32_selfcheck
|
||||
#define pixman_region32_reset _moz_pixman_region32_reset
|
||||
#define pixman_region32_clear _moz_pixman_region32_clear
|
||||
#define pixman_region32_print _moz_pixman_region32_print
|
||||
#define pixman_blt _moz_pixman_blt
|
||||
#define pixman_fill _moz_pixman_fill
|
||||
#define pixman_transform_point_3d _moz_pixman_transform_point_3d
|
||||
@ -86,6 +100,9 @@
|
||||
#define pixman_rasterize_edges _moz_pixman_rasterize_edges
|
||||
#define pixman_add_traps _moz_pixman_add_traps
|
||||
#define pixman_add_trapezoids _moz_pixman_add_trapezoids
|
||||
#define pixman_add_triangles _moz_pixman_add_triangles
|
||||
#define pixman_composite_trapezoids _moz_pixman_composite_trapezoids
|
||||
#define pixman_composite_triangles _moz_pixman_composite_triangles
|
||||
#define pixman_rasterize_trapezoid _moz_pixman_rasterize_trapezoid
|
||||
#define pixman_disable_out_of_bounds_workaround _moz_pixman_disable_out_of_bounds_workaround
|
||||
#define pixman_f_transform_bounds _moz_pixman_f_transform_bounds
|
||||
|
||||
Loading…
Reference in New Issue
Block a user