зеркало из https://github.com/mozilla/gecko-dev.git
29 строки
899 B
Diff
29 строки
899 B
Diff
|
From f2fa15680ec3ac95cb68d4957557f06561a7dc55 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Karl Tomlinson <karlt+@karlt.net>
|
||
|
|
Date: Fri, 16 Jul 2010 22:39:50 +0000
|
||
|
|
Subject: clip: return empty clip from _cairo_clip_copy_rectangle_list when all_clipped
|
||
|
|
|
||
|
|
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=29122
|
||
|
|
Tested by test/get-clip
|
||
|
|
|
||
|
|
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
|
||
|
|
---
|
||
|
|
diff --git a/src/cairo-clip.c b/src/cairo-clip.c
|
||
|
|
index 12dc04d..f6173c6 100644
|
||
|
|
--- a/src/cairo-clip.c
|
||
|
|
+++ b/src/cairo-clip.c
|
||
|
|
@@ -1499,7 +1499,10 @@ _cairo_clip_copy_rectangle_list (cairo_clip_t *clip, cairo_gstate_t *gstate)
|
||
|
|
int n_rects = 0;
|
||
|
|
int i;
|
||
|
|
|
||
|
|
- if (clip != NULL && clip->path != NULL) {
|
||
|
|
+ if (clip->all_clipped)
|
||
|
|
+ goto DONE;
|
||
|
|
+
|
||
|
|
+ if (clip->path != NULL) {
|
||
|
|
status = _cairo_clip_get_region (clip, ®ion);
|
||
|
|
if (status == CAIRO_INT_STATUS_NOTHING_TO_DO) {
|
||
|
|
goto DONE;
|
||
|
|
--
|
||
|
|
cgit v0.8.3-6-g21f6
|