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

cally: Use the Actor API instead of ClutterContainer

Browse Source 
Cally is doing a bunch of list traversals through the list returned by
ClutterContainer.get_children(); this means a traversal already, plus
a bunch of allocations. We can do better than that, now that we have
a proper graph iteration API inside ClutterActor.
This commit is contained in:
Emmanuele Bassi 2011-12-18 22:33:24 +00:00
parent bd58694678
commit 4d75e7a0f4
1 changed files with 25 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
clutter/cally/cally-actor.c
View File

@ -462,11 +462,11 @@ cally_actor_get_parent (AtkObject *obj)
static gint static gint
cally_actor_get_index_in_parent (AtkObject *obj) cally_actor_get_index_in_parent (AtkObject *obj)
{ {
CallyActor *cally_actor = NULL; CallyActor *cally_actor = NULL;
ClutterActor *actor = NULL; ClutterActor *actor = NULL;
ClutterActor *parent_actor = NULL; ClutterActor *parent_actor = NULL;
GList *children = NULL; ClutterActor *iter;
gint index = -1; gint index = -1;
g_return_val_if_fail (CALLY_IS_ACTOR (obj), -1); g_return_val_if_fail (CALLY_IS_ACTOR (obj), -1);
@ -496,14 +496,17 @@ cally_actor_get_index_in_parent (AtkObject *obj)
if (actor == NULL) /* Object is defunct */ if (actor == NULL) /* Object is defunct */
return -1; return -1;
parent_actor = clutter_actor_get_parent(actor); index = 0;
if ((parent_actor == NULL)||(!CLUTTER_IS_CONTAINER(parent_actor))) parent_actor = clutter_actor_get_parent (actor);
if (parent_actor == NULL)
return -1; return -1;
children = clutter_container_get_children(CLUTTER_CONTAINER(parent_actor)); for (iter = clutter_actor_get_first_child (parent_actor);
iter != NULL && iter != actor;
index = g_list_index (children, actor); iter = clutter_actor_get_next_sibling (iter))
g_list_free (children); {
index += 1;
}
return index; return index;
} }
@ -565,9 +568,7 @@ cally_actor_ref_state_set (AtkObject *obj)
static gint static gint
cally_actor_get_n_children (AtkObject *obj) cally_actor_get_n_children (AtkObject *obj)
{ {
ClutterActor *actor = NULL; ClutterActor *actor = NULL;
GList *children = NULL;
gint num = 0;
g_return_val_if_fail (CALLY_IS_ACTOR (obj), 0); g_return_val_if_fail (CALLY_IS_ACTOR (obj), 0);
@ -578,57 +579,32 @@ cally_actor_get_n_children (AtkObject *obj)
g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), 0); g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), 0);
if (CLUTTER_IS_CONTAINER (actor)) return clutter_actor_get_n_children (actor);
{
children = clutter_container_get_children (CLUTTER_CONTAINER (actor));
num = g_list_length (children);
g_list_free (children);
}
else
{
num = 0;
}
return num;
} }
static AtkObject* static AtkObject*
cally_actor_ref_child (AtkObject *obj, cally_actor_ref_child (AtkObject *obj,
gint i) gint i)
{ {
ClutterActor *actor = NULL; ClutterActor *actor = NULL;
ClutterActor *child = NULL; ClutterActor *child = NULL;
GList *children = NULL;
AtkObject *result = NULL;
g_return_val_if_fail (CALLY_IS_ACTOR (obj), NULL); g_return_val_if_fail (CALLY_IS_ACTOR (obj), NULL);
actor = CALLY_GET_CLUTTER_ACTOR (obj); actor = CALLY_GET_CLUTTER_ACTOR (obj);
if (actor == NULL) /* State is defunct */ if (actor == NULL) /* State is defunct */
{ return NULL;
return NULL;
}
g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL); g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL);
if (CLUTTER_IS_CONTAINER (actor)) if (i >= clutter_actor_get_n_children (actor))
{ return NULL;
children = clutter_container_get_children (CLUTTER_CONTAINER (actor));
child = g_list_nth_data (children, i);
result = clutter_actor_get_accessible (child); child = clutter_actor_get_child_at_index (actor, i);
if (child == NULL)
return NULL;
g_object_ref (result); return g_object_ref (clutter_actor_get_accessible (child));
g_list_free (children);
}
else
{
result = NULL;
}
return result;
} }
static AtkAttributeSet * static AtkAttributeSet *