gfx/cairo/disable-previous-scaled-font-cache.patch@97036ab72558 (annotated)
gfx/cairo/disable-previous-scaled-font-cache.patch
Tue, 06 Jan 2015 21:39:09 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 06 Jan 2015 21:39:09 +0100
- branch
- TOR_BUG_9701
- changeset 8
- 97036ab72558
- permissions
- -rw-r--r--
Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.
| michael@0 | 1 | diff --git a/gfx/cairo/cairo/src/cairo.c b/gfx/cairo/cairo/src/cairo.c |
| michael@0 | 2 | --- a/gfx/cairo/cairo/src/cairo.c |
| michael@0 | 3 | +++ b/gfx/cairo/cairo/src/cairo.c |
| michael@0 | 4 | @@ -3201,8 +3201,12 @@ cairo_set_scaled_font (cairo_t |
| michael@0 | 5 | |
| michael@0 | 6 | _cairo_gstate_set_font_options (cr->gstate, &scaled_font->options); |
| michael@0 | 7 | |
| michael@0 | 8 | + /* XXX: Mozilla code assumes that the ctm of a scaled font doesn't need to |
| michael@0 | 9 | + * match the context ctm. This assumption breaks the previous_scaled_font |
| michael@0 | 10 | + * cache. So we avoid using the cache for now. |
| michael@0 | 11 | if (was_previous) |
| michael@0 | 12 | cr->gstate->scaled_font = cairo_scaled_font_reference ((cairo_scaled_font_t *) scaled_font); |
| michael@0 | 13 | + */ |
| michael@0 | 14 | |
| michael@0 | 15 | return; |
| michael@0 | 16 |
