forked from mirrors/gecko-dev
64df3d06dc
When we did the major cairo update in bug 739096, most of our old patch files were superseded and no longer relevant, but I failed to clean them up at the time. So here, we remove all the old patch files, and create new ones just for the fixes we've applied on top of the new code from upstream. I've omitted patch files for fixes that I am aware have already landed upstream, as those will automatically be included in any future update we take. (It's possible more of the new patch files will also be obsolete by the time we try pulling a new version, but at least they should provide a starting point.) Differential Revision: https://phabricator.services.mozilla.com/D164680
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
diff --git a/gfx/cairo/cairo/src/cairo-ft-font.c b/gfx/cairo/cairo/src/cairo-ft-font.c
|
|
--- a/gfx/cairo/cairo/src/cairo-ft-font.c
|
|
+++ b/gfx/cairo/cairo/src/cairo-ft-font.c
|
|
@@ -3736,7 +3736,8 @@ cairo_ft_font_face_create_for_pattern (F
|
|
**/
|
|
cairo_font_face_t *
|
|
cairo_ft_font_face_create_for_ft_face (FT_Face face,
|
|
- int load_flags)
|
|
+ int load_flags,
|
|
+ unsigned int synth_flags)
|
|
{
|
|
cairo_ft_unscaled_font_t *unscaled;
|
|
cairo_font_face_t *font_face;
|
|
@@ -3748,7 +3749,7 @@ cairo_ft_font_face_create_for_ft_face (F
|
|
return (cairo_font_face_t *)&_cairo_font_face_nil;
|
|
|
|
ft_options.load_flags = load_flags;
|
|
- ft_options.synth_flags = 0;
|
|
+ ft_options.synth_flags = synth_flags;
|
|
_cairo_font_options_init_default (&ft_options.base);
|
|
|
|
font_face = _cairo_ft_font_face_create (unscaled, &ft_options);
|
|
diff --git a/gfx/cairo/cairo/src/cairo-ft.h b/gfx/cairo/cairo/src/cairo-ft.h
|
|
--- a/gfx/cairo/cairo/src/cairo-ft.h
|
|
+++ b/gfx/cairo/cairo/src/cairo-ft.h
|
|
@@ -54,7 +54,8 @@ CAIRO_BEGIN_DECLS
|
|
|
|
cairo_public cairo_font_face_t *
|
|
cairo_ft_font_face_create_for_ft_face (FT_Face face,
|
|
- int load_flags);
|
|
+ int load_flags,
|
|
+ unsigned int synth_flags);
|
|
|
|
/**
|
|
* cairo_ft_synthesize_t:
|