18-quartz-granular-ifdefs.patch (2774B)
1 # HG changeset patch 2 # User Jonathan Kew <jkew@mozilla.com> 3 # Date 1713891373 -3600 4 # Tue Apr 23 17:56:13 2024 +0100 5 # Node ID a7bd4153d6421d17cb2991435ceb5a5fff06dba6 6 # Parent c0c2246d28b91b5e933f42d903b06d575d943e6e 7 Bug 1892913 - patch 16 - Apply 18-quartz-granular-ifdefs.patch 8 9 diff --git a/gfx/cairo/cairo/src/cairo-quartz-font.c b/gfx/cairo/cairo/src/cairo-quartz-font.c 10 --- a/gfx/cairo/cairo/src/cairo-quartz-font.c 11 +++ b/gfx/cairo/cairo/src/cairo-quartz-font.c 12 @@ -65,7 +65,9 @@ 13 14 /* These are private functions */ 15 static bool (*CGContextGetAllowsFontSmoothingPtr) (CGContextRef) = NULL; 16 +#ifdef CAIRO_HAS_QUARTZ_ATSUFONTID 17 static ATSFontRef (*FMGetATSFontRefFromFontPtr) (FMFont iFont) = NULL; 18 +#endif /* CAIRO_HAS_QUARTZ_ATSUFONTID */ 19 20 static cairo_bool_t _cairo_quartz_font_symbol_lookup_done = FALSE; 21 /* Cairo's transformations assume a unit-scaled font. */ 22 @@ -92,7 +94,9 @@ quartz_font_ensure_symbols(void) 23 CGContextGetAllowsFontSmoothingPtr = 24 dlsym (RTLD_DEFAULT, "CGContextGetAllowsFontSmoothing"); 25 26 +#ifdef CAIRO_HAS_QUARTZ_ATSUFONTID 27 FMGetATSFontRefFromFontPtr = dlsym(RTLD_DEFAULT, "FMGetATSFontRefFromFont"); 28 +#endif /* CAIRO_HAS_QUARTZ_ATSUFONTID */ 29 30 _cairo_quartz_font_symbol_lookup_done = TRUE; 31 } 32 @@ -795,6 +799,7 @@ CTFontRef 33 /* 34 * compat with old ATSUI backend 35 */ 36 +#ifdef CAIRO_HAS_QUARTZ_ATSUFONTID 37 38 /** 39 * cairo_quartz_font_face_create_for_atsu_font_id: 40 @@ -838,3 +843,5 @@ cairo_atsui_font_face_create_for_atsu_fo 41 { 42 return cairo_quartz_font_face_create_for_atsu_font_id (font_id); 43 } 44 + 45 +#endif /* CAIRO_HAS_QUARTZ_ATSUFONTID */ 46 diff --git a/gfx/cairo/cairo/src/cairo-quartz-image.h b/gfx/cairo/cairo/src/cairo-quartz-image.h 47 --- a/gfx/cairo/cairo/src/cairo-quartz-image.h 48 +++ b/gfx/cairo/cairo/src/cairo-quartz-image.h 49 @@ -40,8 +40,6 @@ 50 51 #if CAIRO_HAS_QUARTZ_IMAGE_SURFACE 52 53 -#include <Carbon/Carbon.h> 54 - 55 CAIRO_BEGIN_DECLS 56 57 cairo_public cairo_surface_t * 58 diff --git a/gfx/cairo/cairo/src/cairo-quartz.h b/gfx/cairo/cairo/src/cairo-quartz.h 59 --- a/gfx/cairo/cairo/src/cairo-quartz.h 60 +++ b/gfx/cairo/cairo/src/cairo-quartz.h 61 @@ -40,7 +40,14 @@ 62 63 #if CAIRO_HAS_QUARTZ_SURFACE 64 65 +#if CAIRO_HAS_QUARTZ_CORE_GRAPHICS 66 +#include <CoreGraphics/CoreGraphics.h> 67 +#include <CoreText/CoreText.h> 68 +#endif 69 + 70 +#if CAIRO_HAS_QUARTZ_APPLICATION_SERVICES 71 #include <ApplicationServices/ApplicationServices.h> 72 +#endif 73 74 CAIRO_BEGIN_DECLS 75 76 @@ -69,8 +76,10 @@ cairo_quartz_surface_get_image (cairo_su 77 cairo_public cairo_font_face_t * 78 cairo_quartz_font_face_create_for_cgfont (CGFontRef font); 79 80 +#if CAIRO_HAS_QUARTZ_ATSUFONTID 81 cairo_public cairo_font_face_t * 82 cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id); 83 +#endif /* CAIRO_HAS_QUARTZ_ATSUFONTID */ 84 85 #endif /* CAIRO_HAS_QUARTZ_FONT */