gfx/cairo/surface-clipper.patch@97036ab72558 (annotated)
gfx/cairo/surface-clipper.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 | commit 061cc774a861f349334117203c301dee202f9f26 |
| michael@0 | 2 | Author: Jeff Muizelaar <jmuizelaar@mozilla.com> |
| michael@0 | 3 | Date: Wed Apr 7 23:05:48 2010 -0400 |
| michael@0 | 4 | |
| michael@0 | 5 | Remove an incorrect optimization that was causing the clip |
| michael@0 | 6 | not to be set when it should've been. |
| michael@0 | 7 | |
| michael@0 | 8 | This happens when the path is equal but the parents aren't shared. |
| michael@0 | 9 | |
| michael@0 | 10 | diff --git a/src/cairo-surface-clipper.c b/src/cairo-surface-clipper.c |
| michael@0 | 11 | index d536f0c..03610d1 100644 |
| michael@0 | 12 | --- a/src/cairo-surface-clipper.c |
| michael@0 | 13 | +++ b/src/cairo-surface-clipper.c |
| michael@0 | 14 | @@ -78,12 +78,6 @@ _cairo_surface_clipper_set_clip (cairo_surface_clipper_t *clipper, |
| michael@0 | 15 | if (clip != NULL && clip->path == clipper->clip.path) |
| michael@0 | 16 | return CAIRO_STATUS_SUCCESS; |
| michael@0 | 17 | |
| michael@0 | 18 | - if (clip != NULL && clipper->clip.path != NULL && |
| michael@0 | 19 | - _cairo_path_fixed_equal (&clip->path->path, &clipper->clip.path->path)) |
| michael@0 | 20 | - { |
| michael@0 | 21 | - return CAIRO_STATUS_SUCCESS; |
| michael@0 | 22 | - } |
| michael@0 | 23 | - |
| michael@0 | 24 | /* all clipped out state should never propagate this far */ |
| michael@0 | 25 | assert (clip == NULL || clip->path != NULL); |
| michael@0 | 26 |
