sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

actor: Identify allocation cycles

Browse source 
If an actor calls directly or indirectly clutter_actor_queue_relayout()
on itself from within the allocate() implementation it will cause a
relayout cycle. This is usually a condition that should be checked by
ClutterActor and we should emit a warning if it is verified.
This commit is contained in:
Emmanuele Bassi 2009-10-23 10:17:40 +01:00
parent ca15143d1f
commit c882893e91
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
clutter/clutter-actor.c
View file

@ -4470,6 +4470,17 @@ clutter_actor_queue_relayout (ClutterActor *self)
priv->needs_allocation) priv->needs_allocation)
return; /* save some cpu cycles */ return; /* save some cpu cycles */
if (!(CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IS_TOPLEVEL) &&
(CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IN_RELAYOUT))
{
g_warning ("The actor '%s' is currently inside an allocation "
"cycle; calling clutter_actor_queue_relayout() is "
"not allowed",
priv->name ? priv->name
: G_OBJECT_TYPE_NAME (self));
return;
}
g_signal_emit (self, actor_signals[QUEUE_RELAYOUT], 0); g_signal_emit (self, actor_signals[QUEUE_RELAYOUT], 0);
} }
@ -4847,8 +4858,12 @@ clutter_actor_allocate (ClutterActor *self,
if (child_moved) if (child_moved)
flags |= CLUTTER_ABSOLUTE_ORIGIN_CHANGED; flags |= CLUTTER_ABSOLUTE_ORIGIN_CHANGED;
CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_ACTOR_IN_RELAYOUT);
klass = CLUTTER_ACTOR_GET_CLASS (self); klass = CLUTTER_ACTOR_GET_CLASS (self);
klass->allocate (self, box, flags); klass->allocate (self, box, flags);
CLUTTER_UNSET_PRIVATE_FLAGS (self, CLUTTER_ACTOR_IN_RELAYOUT);
} }
/** /**