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.

     1 diff --git a/gfx/cairo/cairo/src/cairo.c b/gfx/cairo/cairo/src/cairo.c
     2 --- a/gfx/cairo/cairo/src/cairo.c
     3 +++ b/gfx/cairo/cairo/src/cairo.c
     4 @@ -3201,8 +3201,12 @@ cairo_set_scaled_font (cairo_t          
     6      _cairo_gstate_set_font_options (cr->gstate, &scaled_font->options);
     8 +    /* XXX: Mozilla code assumes that the ctm of a scaled font doesn't need to
     9 +     * match the context ctm. This assumption breaks the previous_scaled_font
    10 +     * cache. So we avoid using the cache for now.
    11      if (was_previous)
    12  	cr->gstate->scaled_font = cairo_scaled_font_reference ((cairo_scaled_font_t *) scaled_font);
    13 +    */
    15      return;

mercurial