gfx/cairo/fixup-unbounded.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-image-surface.c b/gfx/cairo/cairo/src/cairo-image-surface.c
     2 --- a/gfx/cairo/cairo/src/cairo-image-surface.c
     3 +++ b/gfx/cairo/cairo/src/cairo-image-surface.c
     4 @@ -1797,17 +1797,17 @@ _cairo_image_surface_fixup_unbounded_box
     5  					    cairo_boxes_t *boxes)
     6  {
     7      cairo_boxes_t clear;
     8      cairo_box_t box;
     9      cairo_status_t status;
    10      struct _cairo_boxes_chunk *chunk;
    11      int i;
    13 -    if (boxes->num_boxes <= 1 && clip_region == NULL)
    14 +    if (boxes->num_boxes < 1 && clip_region == NULL)
    15  	return _cairo_image_surface_fixup_unbounded (dst, extents, NULL);
    17      _cairo_boxes_init (&clear);
    19      box.p1.x = _cairo_fixed_from_int (extents->unbounded.x + extents->unbounded.width);
    20      box.p1.y = _cairo_fixed_from_int (extents->unbounded.y);
    21      box.p2.x = _cairo_fixed_from_int (extents->unbounded.x);
    22      box.p2.y = _cairo_fixed_from_int (extents->unbounded.y + extents->unbounded.height);

mercurial