gfx/cairo/fixup-unbounded.patch

Sat, 03 Jan 2015 20:18:00 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sat, 03 Jan 2015 20:18:00 +0100
branch
TOR_BUG_3246
changeset 7
129ffea94266
permissions
-rw-r--r--

Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.

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 @@ -1797,17 +1797,17 @@ _cairo_image_surface_fixup_unbounded_box
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 + if (boxes->num_boxes < 1 && clip_region == NULL)
michael@0 15 return _cairo_image_surface_fixup_unbounded (dst, extents, NULL);
michael@0 16
michael@0 17 _cairo_boxes_init (&clear);
michael@0 18
michael@0 19 box.p1.x = _cairo_fixed_from_int (extents->unbounded.x + extents->unbounded.width);
michael@0 20 box.p1.y = _cairo_fixed_from_int (extents->unbounded.y);
michael@0 21 box.p2.x = _cairo_fixed_from_int (extents->unbounded.x);
michael@0 22 box.p2.y = _cairo_fixed_from_int (extents->unbounded.y + extents->unbounded.height);

mercurial