From 85e3cffde164a5af444639dfd182fde2448809ee Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 30 Apr 2010 21:09:01 +0100 Subject: [PATCH] test: Add subsurface-modify-{child,parent} Add tests to ensure that modifications to the subsurface via the original surface are tracked by the subsurface, i.e. that any snapshots are detached upon modification of the parent as well as modification of itself and vice versa. --- test/Makefile.am | 2 + test/Makefile.sources | 2 + test/subsurface-modify-child.c | 98 ++++++++++++++++++++++++++ test/subsurface-modify-child.ref.png | Bin 0 -> 197 bytes test/subsurface-modify-parent.c | 77 ++++++++++++++++++++ test/subsurface-modify-parent.ref.png | Bin 0 -> 197 bytes 6 files changed, 179 insertions(+) create mode 100644 test/subsurface-modify-child.c create mode 100644 test/subsurface-modify-child.ref.png create mode 100644 test/subsurface-modify-parent.c create mode 100644 test/subsurface-modify-parent.ref.png diff --git a/test/Makefile.am b/test/Makefile.am index 8607a547c..622df8def 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1075,6 +1075,8 @@ REFERENCE_IMAGES = \ subsurface.image16.ref.png \ subsurface-reflect.ref.png \ subsurface-repeat.ref.png \ + subsurface-modify-child.ref.png \ + subsurface-modify-parent.ref.png \ subsurface-similar-repeat.ref.png \ surface-pattern-big-scale-down.ref.png \ surface-pattern-big-scale-down.ps.xfail.png \ diff --git a/test/Makefile.sources b/test/Makefile.sources index 4224786fe..5817097c7 100644 --- a/test/Makefile.sources +++ b/test/Makefile.sources @@ -228,6 +228,8 @@ test_sources = \ subsurface.c \ subsurface-repeat.c \ subsurface-reflect.c \ + subsurface-modify-child.c \ + subsurface-modify-parent.c \ subsurface-similar-repeat.c \ surface-finish-twice.c \ surface-pattern.c \ diff --git a/test/subsurface-modify-child.c b/test/subsurface-modify-child.c new file mode 100644 index 000000000..3a1e8ff05 --- /dev/null +++ b/test/subsurface-modify-child.c @@ -0,0 +1,98 @@ +/* + * Copyright 2010 Intel Corporation + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without + * fee, provided that the above copyright notice appear in all copies + * and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of + * Intel not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior + * permission. Intel makes no representations about the + * suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * INTEL CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY SPECIAL, + * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR + * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Chris Wilson + */ + +#include "cairo-test.h" + +static cairo_test_status_t +draw (cairo_t *cr, int width, int height) +{ + cairo_surface_t *region, *similar; + cairo_t *cr_region, *cr_similar; + + cairo_set_source_rgb (cr, .5, .5, .5); + cairo_paint (cr); + + similar = cairo_surface_create_similar (cairo_get_target (cr), + CAIRO_CONTENT_COLOR_ALPHA, + 20, 20); + + /* copy the centre */ + cr_similar = cairo_create (similar); + cairo_surface_destroy (similar); + cairo_set_source_surface (cr_similar, cairo_get_target (cr), -20, -20); + cairo_paint (cr_similar); + similar = cairo_surface_reference (cairo_get_target (cr_similar)); + cairo_destroy (cr_similar); + + /* fill the centre */ + region = cairo_surface_create_for_rectangle (cairo_get_target (cr), + 20, 20, 20, 20); + cr_region = cairo_create (region); + cairo_surface_destroy (region); + + cairo_set_source_rgb (cr_region, 1, 1, 1); + cairo_rectangle (cr_region, 0, 0, 10, 10); + cairo_fill (cr_region); + + cairo_set_source_rgb (cr_region, 1, 0, 0); + cairo_rectangle (cr_region, 10, 0, 10, 10); + cairo_fill (cr_region); + + cairo_set_source_rgb (cr_region, 0, 1, 0); + cairo_rectangle (cr_region, 0, 10, 10, 10); + cairo_fill (cr_region); + + cairo_set_source_rgb (cr_region, 0, 0, 1); + cairo_rectangle (cr_region, 10, 10, 10, 10); + cairo_fill (cr_region); + + cairo_destroy (cr_region); + + /* copy the centre, again */ + cr_similar = cairo_create (similar); + cairo_surface_destroy (similar); + cairo_set_source_surface (cr_similar, cairo_get_target (cr), -20, -20); + cairo_paint (cr_similar); + similar = cairo_surface_reference (cairo_get_target (cr_similar)); + cairo_destroy (cr_similar); + + /* repeat the pattern around the outside, but do not overwrite...*/ + cairo_set_source_surface (cr, similar, 20, 20); + cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + cairo_rectangle (cr, 0, 0, width, height); + cairo_rectangle (cr, 20, 40, 20, -20); + cairo_fill (cr); + + cairo_surface_destroy (similar); + + return CAIRO_TEST_SUCCESS; +} + +CAIRO_TEST (subsurface_modify_child, + "Tests source clipping with later modifications", + "subsurface", /* keywords */ + NULL, /* requirements */ + 60, 60, + NULL, draw) diff --git a/test/subsurface-modify-child.ref.png b/test/subsurface-modify-child.ref.png new file mode 100644 index 0000000000000000000000000000000000000000..c37e22e36efcff85411b853c9bf5b963ca744b7c GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*`wjDT?g&mTKB9LX_|g%-b}7tmtQZvIaMt_)#PYK*F}-Vn!B~% zt?jCQed*0~`&^h<^}IWkmETU!H=C6N5z2P~t91+RSyrJO)U!;&*AOHnJrOFuSd%?S XNTMleOV0_QD;PXo{an^LB{Ts5#Ys+N literal 0 HcmV?d00001 diff --git a/test/subsurface-modify-parent.c b/test/subsurface-modify-parent.c new file mode 100644 index 000000000..3dab2dd77 --- /dev/null +++ b/test/subsurface-modify-parent.c @@ -0,0 +1,77 @@ +/* + * Copyright 2010 Intel Corporation + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without + * fee, provided that the above copyright notice appear in all copies + * and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of + * Intel not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior + * permission. Intel makes no representations about the + * suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * INTEL CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY SPECIAL, + * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR + * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Chris Wilson + */ + +#include "cairo-test.h" + +static cairo_test_status_t +draw (cairo_t *cr, int width, int height) +{ + cairo_surface_t *region; + + cairo_set_source_rgb (cr, .5, .5, .5); + cairo_paint (cr); + + /* fill the centre, but through the *original* surface */ + region = cairo_surface_create_for_rectangle (cairo_get_target (cr), + 20, 20, 20, 20); + + /* first trigger a snapshot of the region... */ + cairo_set_source_surface (cr, region, 20, 20); + cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + cairo_paint (cr); + + cairo_set_source_rgb (cr, 1, 1, 1); + cairo_rectangle (cr, 20, 20, 10, 10); + cairo_fill (cr); + + cairo_set_source_rgb (cr, 1, 0, 0); + cairo_rectangle (cr, 30, 20, 10, 10); + cairo_fill (cr); + + cairo_set_source_rgb (cr, 0, 1, 0); + cairo_rectangle (cr, 20, 30, 10, 10); + cairo_fill (cr); + + cairo_set_source_rgb (cr, 0, 0, 1); + cairo_rectangle (cr, 30, 30, 10, 10); + cairo_fill (cr); + + cairo_set_source_surface (cr, region, 20, 20); + + /* repeat the pattern around the outside, but do not overwrite...*/ + cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + cairo_rectangle (cr, 0, 0, width, height); + cairo_rectangle (cr, 20, 40, 20, -20); + cairo_fill (cr); + + return CAIRO_TEST_SUCCESS; +} + +CAIRO_TEST (subsurface_modify_parent, + "Tests source clipping with later modifications", + "subsurface", /* keywords */ + NULL, /* requirements */ + 60, 60, + NULL, draw) diff --git a/test/subsurface-modify-parent.ref.png b/test/subsurface-modify-parent.ref.png new file mode 100644 index 0000000000000000000000000000000000000000..c37e22e36efcff85411b853c9bf5b963ca744b7c GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*`wjDT?g&mTKB9LX_|g%-b}7tmtQZvIaMt_)#PYK*F}-Vn!B~% zt?jCQed*0~`&^h<^}IWkmETU!H=C6N5z2P~t91+RSyrJO)U!;&*AOHnJrOFuSd%?S XNTMleOV0_QD;PXo{an^LB{Ts5#Ys+N literal 0 HcmV?d00001