From bb4e87bf3578d681b17f34af5321c638120d1236 Mon Sep 17 00:00:00 2001 From: Robert Mader Date: Sun, 28 Jun 2020 23:43:56 +0200 Subject: [PATCH 1/2] shaped-texture: Make set_opaque_region() private The shell doesn't use it and I couldn't find any extensions that does and it probably doesn't make much sense any more these days anyway. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1334 --- src/compositor/meta-shaped-texture-private.h | 2 ++ src/meta/meta-shaped-texture.h | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/compositor/meta-shaped-texture-private.h b/src/compositor/meta-shaped-texture-private.h index c415260c0b7..672f24eb7c1 100644 --- a/src/compositor/meta-shaped-texture-private.h +++ b/src/compositor/meta-shaped-texture-private.h @@ -68,5 +68,7 @@ int meta_shaped_texture_get_height (MetaShapedTexture *stex); void meta_shaped_texture_set_clip_region (MetaShapedTexture *stex, cairo_region_t *clip_region); +void meta_shaped_texture_set_opaque_region (MetaShapedTexture *stex, + cairo_region_t *opaque_region); #endif diff --git a/src/meta/meta-shaped-texture.h b/src/meta/meta-shaped-texture.h index e0a8207ab47..2ca0e6e61db 100644 --- a/src/meta/meta-shaped-texture.h +++ b/src/meta/meta-shaped-texture.h @@ -51,10 +51,6 @@ META_EXPORT void meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex, CoglTexture *mask_texture); -META_EXPORT -void meta_shaped_texture_set_opaque_region (MetaShapedTexture *stex, - cairo_region_t *opaque_region); - META_EXPORT cairo_surface_t * meta_shaped_texture_get_image (MetaShapedTexture *stex, cairo_rectangle_int_t *clip); -- GitLab From 1142f06af52d18b5aeb70ad2e60f7a69c4076d7d Mon Sep 17 00:00:00 2001 From: Robert Mader Date: Mon, 29 Jun 2020 12:57:14 +0200 Subject: [PATCH 2/2] shaped-texture: Clean up set_opaque_region() Make the code more consistent with similar functions elsewhere and save a few cycles by removing the type check. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1334 --- src/compositor/meta-shaped-texture.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c index 630efb8df46..2d7facaa0d3 100644 --- a/src/compositor/meta-shaped-texture.c +++ b/src/compositor/meta-shaped-texture.c @@ -1076,15 +1076,9 @@ void meta_shaped_texture_set_opaque_region (MetaShapedTexture *stex, cairo_region_t *opaque_region) { - g_return_if_fail (META_IS_SHAPED_TEXTURE (stex)); - - if (stex->opaque_region) - cairo_region_destroy (stex->opaque_region); - + g_clear_pointer (&stex->opaque_region, cairo_region_destroy); if (opaque_region) stex->opaque_region = cairo_region_reference (opaque_region); - else - stex->opaque_region = NULL; } cairo_region_t * -- GitLab