summaryrefslogtreecommitdiffstats
path: root/gfx/cairo/use-show-text-glyphs-if-glyph-path-fails.patch
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-06 21:06:15 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-07 14:49:48 +0100
commit7efd71616ec5efedbe626a986a707c35d3cac323 (patch)
tree0223e8271d9d18763efd743f43f98b8b8b9e5c2e /gfx/cairo/use-show-text-glyphs-if-glyph-path-fails.patch
parentbbc2206a0fda053a6f5071b457bd209dab9ed268 (diff)
downloadUXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.gz
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.lz
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.xz
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.zip
Issue #1274 - Part 1: Adopt the cairo version as our own.
- Move header licensing from tri-license to MPL 2.0. MPL-compatible other licensing has been retained where originally present. - Remove individual superseded licensing terms. - Remove patches, outdated readmes & incomplete patch summaries. - Remove incomplete cairo release notes (only went up to 1.6.4 anyway). - Rewrite COPYING to indicate the current state of the library in tree.
Diffstat (limited to 'gfx/cairo/use-show-text-glyphs-if-glyph-path-fails.patch')
-rw-r--r--gfx/cairo/use-show-text-glyphs-if-glyph-path-fails.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/gfx/cairo/use-show-text-glyphs-if-glyph-path-fails.patch b/gfx/cairo/use-show-text-glyphs-if-glyph-path-fails.patch
deleted file mode 100644
index 1670eaf73..000000000
--- a/gfx/cairo/use-show-text-glyphs-if-glyph-path-fails.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Jonathan Kew <jkew@mozilla.com>
-bug 715798 pt 2 - fall back to show_text_glyphs even at huge sizes if scaled_font_glyph_path didn't work. r=jrmuizel
-
-diff --git a/gfx/cairo/cairo/src/cairo-gstate.c b/gfx/cairo/cairo/src/cairo-gstate.c
---- a/gfx/cairo/cairo/src/cairo-gstate.c
-+++ b/gfx/cairo/cairo/src/cairo-gstate.c
-@@ -2002,23 +2002,34 @@ cairo_status_t
- cairo_path_fixed_t path;
-
- _cairo_path_fixed_init (&path);
-
- status = _cairo_scaled_font_glyph_path (gstate->scaled_font,
- transformed_glyphs, num_glyphs,
- &path);
-
-- if (status == CAIRO_STATUS_SUCCESS) {
-+ if (status == CAIRO_STATUS_SUCCESS && !_cairo_path_fixed_fill_is_empty (&path)) {
- status = _cairo_surface_fill (gstate->target, op, pattern,
- &path,
- CAIRO_FILL_RULE_WINDING,
- gstate->tolerance,
- gstate->scaled_font->options.antialias,
- _gstate_get_clip (gstate, &clip));
-+ } else {
-+ /* if _cairo_scaled_font_glyph_path() failed, maybe the font doesn't support
-+ * returning paths, so try the _cairo_surface_show_text_glyphs() option
-+ */
-+ status = _cairo_surface_show_text_glyphs (gstate->target, op, pattern,
-+ utf8, utf8_len,
-+ transformed_glyphs, num_glyphs,
-+ transformed_clusters, num_clusters,
-+ cluster_flags,
-+ gstate->scaled_font,
-+ _gstate_get_clip (gstate, &clip));
- }
-
- _cairo_path_fixed_fini (&path);
- }
-
- _cairo_clip_fini (&clip);
-
- CLEANUP_GLYPHS: