The Tor Browser / file comparison
comparison: gfx/cairo/empty-clip-rectangles.patch
gfx/cairo/empty-clip-rectangles.patch
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
equal
deleted
inserted
replaced
| -1:000000000000 | 0:e2c0d4f82566 |
|---|---|
| 1 From f2fa15680ec3ac95cb68d4957557f06561a7dc55 Mon Sep 17 00:00:00 2001 | |
| 2 From: Karl Tomlinson <karlt+@karlt.net> | |
| 3 Date: Fri, 16 Jul 2010 22:39:50 +0000 | |
| 4 Subject: clip: return empty clip from _cairo_clip_copy_rectangle_list when all_clipped | |
| 5 | |
| 6 Fixes https://bugs.freedesktop.org/show_bug.cgi?id=29122 | |
| 7 Tested by test/get-clip | |
| 8 | |
| 9 Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> | |
| 10 --- | |
| 11 diff --git a/src/cairo-clip.c b/src/cairo-clip.c | |
| 12 index 12dc04d..f6173c6 100644 | |
| 13 --- a/src/cairo-clip.c | |
| 14 +++ b/src/cairo-clip.c | |
| 15 @@ -1499,7 +1499,10 @@ _cairo_clip_copy_rectangle_list (cairo_clip_t *clip, cairo_gstate_t *gstate) | |
| 16 int n_rects = 0; | |
| 17 int i; | |
| 18 | |
| 19 - if (clip != NULL && clip->path != NULL) { | |
| 20 + if (clip->all_clipped) | |
| 21 + goto DONE; | |
| 22 + | |
| 23 + if (clip->path != NULL) { | |
| 24 status = _cairo_clip_get_region (clip, ®ion); | |
| 25 if (status == CAIRO_INT_STATUS_NOTHING_TO_DO) { | |
| 26 goto DONE; | |
| 27 -- | |
| 28 cgit v0.8.3-6-g21f6 |
