diff options
author | Moonchild <moonchild@palemoon.org> | 2019-11-08 10:54:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-08 10:54:27 +0100 |
commit | 0f3635dc8fac240b5e6d2a74d8894d83176bc357 (patch) | |
tree | 91f42e5b7b611e259ae8fb63f84e201032e56382 /gfx/cairo/use-show-text-glyphs-if-glyph-path-fails.patch | |
parent | 8bb208397d2574ffcad436d23d3e8b87b3413141 (diff) | |
parent | 5f80c286cf845cbc1dde8b7d6ea177ddd4f8f39b (diff) | |
download | UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar.gz UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar.lz UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar.xz UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.zip |
Merge pull request #1276 from MoonchildProductions/cairo-work
Update the in-tree cairo code.
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.patch | 42 |
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: |