gfx/cairo/fix-clip-test.patch@97036ab72558 (annotated)
gfx/cairo/fix-clip-test.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 | Fix a clip test to test the right coordinate. |
| michael@0 | 2 | |
| michael@0 | 3 | Fixed upstream by 498c10032ea3f8631a928cd7df96766f2c8ddca4 |
| michael@0 | 4 | diff --git a/gfx/cairo/cairo/src/cairo-clip.c b/gfx/cairo/cairo/src/cairo-clip.c |
| michael@0 | 5 | --- a/gfx/cairo/cairo/src/cairo-clip.c |
| michael@0 | 6 | +++ b/gfx/cairo/cairo/src/cairo-clip.c |
| michael@0 | 7 | @@ -408,7 +408,7 @@ _cairo_clip_rectangle (cairo_clip_t |
| michael@0 | 8 | /* if a smaller clip has already been set, ignore the new path */ |
| michael@0 | 9 | if (clip->path != NULL) { |
| michael@0 | 10 | if (rectangle->x <= clip->path->extents.x && |
| michael@0 | 11 | - rectangle->y <= clip->path->extents.x && |
| michael@0 | 12 | + rectangle->y <= clip->path->extents.y && |
| michael@0 | 13 | rectangle->x + rectangle->width >= clip->path->extents.x + clip->path->extents.width && |
| michael@0 | 14 | rectangle->y + rectangle->height >= clip->path->extents.y + clip->path->extents.height) |
| michael@0 | 15 | { |
