brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

background-actor: Don't bother clipping to the content box

Browse Source 
We already clip to the content box when we go to paint the content.
This commit is contained in:
Jasper St. Pierre 2014-08-07 14:58:18 -04:00
parent 2d6954186e
commit 6858cb261f
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/compositor/meta-background-actor.c
View File

@ -185,7 +185,7 @@ cullable_iface_init (MetaCullableInterface *iface)
* meta_background_actor_get_clip_region: * meta_background_actor_get_clip_region:
* @self: a #MetaBackgroundActor * @self: a #MetaBackgroundActor
* *
* Return value (transfer full): a #cairo_region_t that represents the part of * Return value (transfer none): a #cairo_region_t that represents the part of
* the background not obscured by other #MetaBackgroundActor or * the background not obscured by other #MetaBackgroundActor or
* #MetaWindowActor objects. * #MetaWindowActor objects.
*/ */
@ -193,24 +193,5 @@ cairo_region_t *
meta_background_actor_get_clip_region (MetaBackgroundActor *self) meta_background_actor_get_clip_region (MetaBackgroundActor *self)
{ {
MetaBackgroundActorPrivate *priv = self->priv; MetaBackgroundActorPrivate *priv = self->priv;
ClutterActorBox content_box; return priv->clip_region;
cairo_rectangle_int_t content_area = { 0 };
cairo_region_t *clip_region;
g_return_val_if_fail (META_IS_BACKGROUND_ACTOR (self), NULL);
if (!priv->clip_region)
return NULL;
clutter_actor_get_content_box (CLUTTER_ACTOR (self), &content_box);
content_area.x = content_box.x1;
content_area.y = content_box.y1;
content_area.width = content_box.x2 - content_box.x1;
content_area.height = content_box.y2 - content_box.y1;
clip_region = cairo_region_create_rectangle (&content_area);
cairo_region_intersect (clip_region, priv->clip_region);
return clip_region;
} }

3
src/compositor/meta-background.c
View File

@ -441,10 +441,7 @@ meta_background_paint_content (ClutterContent *content,
clip_region = meta_background_actor_get_clip_region (META_BACKGROUND_ACTOR (actor)); clip_region = meta_background_actor_get_clip_region (META_BACKGROUND_ACTOR (actor));
if (clip_region != NULL) if (clip_region != NULL)
{
cairo_region_intersect (paintable_region, clip_region); cairo_region_intersect (paintable_region, clip_region);
cairo_region_destroy (clip_region);
}
} }
/* Finally, split the paintable region up into distinct areas /* Finally, split the paintable region up into distinct areas