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

clutter/actor: Refactor updating of the paint volume

Browse Source 
For clarity and for further improvements, introduce a separate function
to update the paint volume instead of doing that inside
_clutter_actor_get_paint_volume_mutable().

Also add a FIXME comment for a possible bug I noticed while working on
it.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1492>
This commit is contained in:
Jonas Dreßler 2020-10-17 13:12:50 +02:00 committed by Marge Bot
parent 2541979f8e
commit 66d8f51da1
1 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
clutter/clutter/clutter-actor.c
View File

@ -15148,6 +15148,53 @@ _clutter_actor_has_active_paint_volume_override_effects (ClutterActor *self)
return FALSE; return FALSE;
} }
static void
ensure_paint_volume (ClutterActor *self)
{
ClutterActorPrivate *priv = self->priv;
gboolean has_paint_volume_override_effects;
gboolean must_update_paint_volume;
has_paint_volume_override_effects = _clutter_actor_has_active_paint_volume_override_effects (self);
/* If effects are applied, the actor paint volume
* needs to be recomputed on each paint, since those
* paint volumes could change over the duration of the
* effect.
*
* We also need to update the paint volume if we went
* from having effects to not having effects on the last
* paint volume update.
*
* FIXME: This opens the door for some tricky issues: If our paint volume
* is invalid, it's implied that all parent paint volumes are invalid. If
* we don't want to break that invariant, we should find a better solution
* to deal with effects.
*/
must_update_paint_volume =
priv->current_effect != NULL ||
has_paint_volume_override_effects ||
priv->had_effects_on_last_paint_volume_update;
priv->needs_paint_volume_update |= must_update_paint_volume;
if (priv->needs_paint_volume_update)
{
priv->had_effects_on_last_paint_volume_update = has_paint_volume_override_effects;
if (priv->paint_volume_valid)
clutter_paint_volume_free (&priv->paint_volume);
priv->paint_volume_valid = FALSE;
if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume))
{
priv->paint_volume_valid = TRUE;
priv->needs_paint_volume_update = FALSE;
}
}
}
/* The public clutter_actor_get_paint_volume API returns a const /* The public clutter_actor_get_paint_volume API returns a const
* pointer since we return a pointer directly to the cached * pointer since we return a pointer directly to the cached
* PaintVolume associated with the actor and don't want the user to * PaintVolume associated with the actor and don't want the user to
@ -15158,44 +15205,14 @@ _clutter_actor_has_active_paint_volume_override_effects (ClutterActor *self)
static ClutterPaintVolume * static ClutterPaintVolume *
_clutter_actor_get_paint_volume_mutable (ClutterActor *self) _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
{ {
gboolean has_paint_volume_override_effects; ClutterActorPrivate *priv = self->priv;
ClutterActorPrivate *priv;
priv = self->priv; ensure_paint_volume (self);
has_paint_volume_override_effects = _clutter_actor_has_active_paint_volume_override_effects (self);
if (priv->paint_volume_valid) if (priv->paint_volume_valid)
{
/* If effects are applied, the actor paint volume
* needs to be recomputed on each paint, since those
* paint volumes could change over the duration of the
* effect.
*
* We also need to update the paint volume if we went
* from having effects to not having effects on the last
* paint volume update. */
if (!priv->needs_paint_volume_update &&
priv->current_effect == NULL &&
!has_paint_volume_override_effects &&
!priv->had_effects_on_last_paint_volume_update)
return &priv->paint_volume; return &priv->paint_volume;
clutter_paint_volume_free (&priv->paint_volume);
}
priv->had_effects_on_last_paint_volume_update = has_paint_volume_override_effects;
if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume))
{
priv->paint_volume_valid = TRUE;
priv->needs_paint_volume_update = FALSE;
return &priv->paint_volume;
}
else
{
priv->paint_volume_valid = FALSE;
return NULL; return NULL;
}
} }
/** /**