isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 19:10:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

MetaShapedTexture: don't intersect a region with an uninitialized clip

Browse Source 
If we skip getting the clip rectangle because we don't have an
allocation or a texture, don't intersect with the visible region.
This avoids a pixman warning of an invalid rectangle.

Reviewed by drago01 in IRC.
This commit is contained in:
Giovanni Campagna 2013-09-16 11:19:56 +02:00
parent 6c1feedbdf
commit 42a5f4f479
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/compositor/meta-shaped-texture.c
View File

@ -691,7 +691,7 @@ wayland_surface_update_area (MetaShapedTexture *stex,
} }
} }
static void static gboolean
get_clip (MetaShapedTexture *stex, get_clip (MetaShapedTexture *stex,
int x, int x,
int y, int y,
@ -717,15 +717,12 @@ get_clip (MetaShapedTexture *stex,
* it here. * it here.
*/ */
if (!clutter_actor_has_allocation (self)) if (!clutter_actor_has_allocation (self))
{ return FALSE;
clutter_actor_queue_redraw (self);
return;
}
priv = stex->priv; priv = stex->priv;
if (priv->tex_width == 0 || priv->tex_height == 0) if (priv->tex_width == 0 || priv->tex_height == 0)
return; return FALSE;
clutter_actor_get_allocation_box (self, &allocation); clutter_actor_get_allocation_box (self, &allocation);
@ -736,6 +733,8 @@ get_clip (MetaShapedTexture *stex,
clip->y = y * scale_y; clip->y = y * scale_y;
clip->width = width * scale_x; clip->width = width * scale_x;
clip->height = height * scale_y; clip->height = height * scale_y;
return TRUE;
} }
/** /**
@ -766,6 +765,7 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex,
{ {
MetaShapedTexturePrivate *priv; MetaShapedTexturePrivate *priv;
cairo_rectangle_int_t clip; cairo_rectangle_int_t clip;
gboolean has_clip;
priv = stex->priv; priv = stex->priv;
@ -785,7 +785,7 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex,
meta_texture_tower_update_area (priv->paint_tower, x, y, width, height); meta_texture_tower_update_area (priv->paint_tower, x, y, width, height);
get_clip (stex, x, y, width, height, &clip); has_clip = get_clip (stex, x, y, width, height, &clip);
if (unobscured_region) if (unobscured_region)
{ {
@ -795,7 +795,8 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex,
return FALSE; return FALSE;
intersection = cairo_region_copy (unobscured_region); intersection = cairo_region_copy (unobscured_region);
cairo_region_intersect_rectangle (intersection, &clip); if (has_clip)
cairo_region_intersect_rectangle (intersection, &clip);
if (!cairo_region_is_empty (intersection)) if (!cairo_region_is_empty (intersection))
{ {
@ -812,7 +813,10 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex,
return FALSE; return FALSE;
} }
clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stex), &clip); if (has_clip)
clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stex), &clip);
else
clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
return TRUE; return TRUE;
} }