From cd4892c50adf6d2cfb835c636eb7ad79a57fb87d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 8 Oct 2017 20:05:16 -0400 Subject: [PATCH] Stop using gsk_cairo_node_new_for_surface Best to avoid handling the surface ourselves. --- testsuite/gsk/test-render-nodes.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/testsuite/gsk/test-render-nodes.c b/testsuite/gsk/test-render-nodes.c index f10dddc1f4..14dd5d91f8 100644 --- a/testsuite/gsk/test-render-nodes.c +++ b/testsuite/gsk/test-render-nodes.c @@ -130,11 +130,10 @@ static GskRenderNode * cairo (void) { GskRenderNode *node; - cairo_surface_t *surface; cairo_t *cr; - surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 200, 600); - cr = cairo_create (surface); + node = gsk_cairo_node_new (&GRAPHENE_RECT_INIT (0, 0, 200, 600)); + cr = gsk_cairo_node_get_draw_context (node, NULL); cairo_set_source_rgb (cr, 1, 0, 0); cairo_rectangle (cr, 0, 0, 200, 200); @@ -146,10 +145,7 @@ cairo (void) cairo_rectangle (cr, 0, 400, 200, 200); cairo_fill (cr); - node = gsk_cairo_node_new_for_surface (&GRAPHENE_RECT_INIT (0, 0, 200, 600), surface); - cairo_destroy (cr); - cairo_surface_destroy (surface); return node; } @@ -158,12 +154,11 @@ static GskRenderNode * cairo2 (void) { GskRenderNode *node; - cairo_surface_t *surface; cairo_t *cr; int i, j; - surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 200, 200); - cr = cairo_create (surface); + node = gsk_cairo_node_new (&GRAPHENE_RECT_INIT (0, 0, 200, 200)); + cr = gsk_cairo_node_get_draw_context (node, NULL); cairo_set_source_rgb (cr, 1, 1, 1); @@ -174,10 +169,8 @@ cairo2 (void) cairo_fill (cr); } - node = gsk_cairo_node_new_for_surface (&GRAPHENE_RECT_INIT (0, 0, 200, 200), surface); cairo_destroy (cr); - cairo_surface_destroy (surface); return node; }