gfx/cairo/disable-previous-scaled-font-cache.patch

Thu, 15 Jan 2015 21:03:48 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 15 Jan 2015 21:03:48 +0100
branch
TOR_BUG_9701
changeset 11
deefc01c0e14
permissions
-rw-r--r--

Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)

     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