gfx/cairo/cairo-mask-extends-bug.patch@97036ab72558 (annotated)
gfx/cairo/cairo-mask-extends-bug.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-image-surface.c b/gfx/cairo/cairo/src/cairo-image-surface.c |
| michael@0 | 2 | --- a/gfx/cairo/cairo/src/cairo-image-surface.c |
| michael@0 | 3 | +++ b/gfx/cairo/cairo/src/cairo-image-surface.c |
| michael@0 | 4 | @@ -1788,18 +1788,35 @@ static cairo_status_t |
| michael@0 | 5 | cairo_boxes_t *boxes) |
| michael@0 | 6 | { |
| michael@0 | 7 | cairo_boxes_t clear; |
| michael@0 | 8 | cairo_box_t box; |
| michael@0 | 9 | cairo_status_t status; |
| michael@0 | 10 | struct _cairo_boxes_chunk *chunk; |
| michael@0 | 11 | int i; |
| michael@0 | 12 | |
| michael@0 | 13 | - if (boxes->num_boxes < 1 && clip_region == NULL) |
| michael@0 | 14 | - return _cairo_image_surface_fixup_unbounded (dst, extents, NULL); |
| michael@0 | 15 | + // If we have no boxes then we need to clear the entire extents |
| michael@0 | 16 | + // because we have nothing to draw. |
| michael@0 | 17 | + if (boxes->num_boxes < 1 && clip_region == NULL) { |
| michael@0 | 18 | + int x = extents->unbounded.x; |
| michael@0 | 19 | + int y = extents->unbounded.y; |
| michael@0 | 20 | + int width = extents->unbounded.width; |
| michael@0 | 21 | + int height = extents->unbounded.height; |
| michael@0 | 22 | + |
| michael@0 | 23 | + pixman_color_t color = { 0 }; |
| michael@0 | 24 | + pixman_box32_t box = { x, y, x + width, y + height }; |
| michael@0 | 25 | + |
| michael@0 | 26 | + if (! pixman_image_fill_boxes (PIXMAN_OP_CLEAR, |
| michael@0 | 27 | + dst->pixman_image, |
| michael@0 | 28 | + &color, |
| michael@0 | 29 | + 1, &box)) { |
| michael@0 | 30 | + return _cairo_error (CAIRO_STATUS_NO_MEMORY); |
| michael@0 | 31 | + } |
| michael@0 | 32 | + return CAIRO_STATUS_SUCCESS; |
| michael@0 | 33 | + } |
| michael@0 | 34 | |
| michael@0 | 35 | _cairo_boxes_init (&clear); |
| michael@0 | 36 | |
| michael@0 | 37 | box.p1.x = _cairo_fixed_from_int (extents->unbounded.x + extents->unbounded.width); |
| michael@0 | 38 | box.p1.y = _cairo_fixed_from_int (extents->unbounded.y); |
| michael@0 | 39 | box.p2.x = _cairo_fixed_from_int (extents->unbounded.x); |
| michael@0 | 40 | box.p2.y = _cairo_fixed_from_int (extents->unbounded.y + extents->unbounded.height); |
| michael@0 | 41 |
