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

cally: Remove Actor.[add|remove]_actor vfuncs

Browse source 
They were not doing anything special other than forwarding the calls.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3814>
This commit is contained in:
Bilal Elmoussaoui 2024-06-15 14:25:34 +02:00
parent 03032805a6
commit 23a4261736
2 changed files with 21 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
clutter/clutter/cally/cally-actor.c
View file

@ -98,12 +98,6 @@ static gint cally_actor_add_actor (ClutterActor *container,
static gint cally_actor_remove_actor (ClutterActor *container, static gint cally_actor_remove_actor (ClutterActor *container,
ClutterActor *actor, ClutterActor *actor,
gpointer data); gpointer data);
static gint cally_actor_real_add_actor (ClutterActor *container,
ClutterActor *actor,
gpointer data);
static gint cally_actor_real_remove_actor (ClutterActor *container,
ClutterActor *actor,
gpointer data);
/* AtkComponent.h */ /* AtkComponent.h */
static void cally_actor_component_interface_init (AtkComponentIface *iface); static void cally_actor_component_interface_init (AtkComponentIface *iface);
@ -211,8 +205,6 @@ cally_actor_class_init (CallyActorClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
klass->notify_clutter = cally_actor_real_notify_clutter; klass->notify_clutter = cally_actor_real_notify_clutter;
klass->add_actor = cally_actor_real_add_actor;
klass->remove_actor = cally_actor_real_remove_actor;
/* GObject */ /* GObject */
gobject_class->finalize = cally_actor_finalize; gobject_class->finalize = cally_actor_finalize;
@ -456,43 +448,9 @@ cally_actor_add_actor (ClutterActor *container,
ClutterActor *actor, ClutterActor *actor,
gpointer data) gpointer data)
{ {
CallyActor *cally_actor = CALLY_ACTOR (data); AtkObject *atk_parent = clutter_actor_get_accessible (container);
CallyActorClass *klass = NULL;
klass = CALLY_ACTOR_GET_CLASS (cally_actor);
if (klass->add_actor)
return klass->add_actor (container, actor, data);
else
return 1;
}
static gint
cally_actor_remove_actor (ClutterActor *container,
ClutterActor *actor,
gpointer data)
{
CallyActor *cally_actor = CALLY_ACTOR (data);
CallyActorClass *klass = NULL;
klass = CALLY_ACTOR_GET_CLASS (cally_actor);
if (klass->remove_actor)
return klass->remove_actor (container, actor, data);
else
return 1;
}
static gint
cally_actor_real_add_actor (ClutterActor *container,
ClutterActor *actor,
gpointer data)
{
AtkObject *atk_parent = ATK_OBJECT (data);
AtkObject *atk_child = clutter_actor_get_accessible (actor); AtkObject *atk_child = clutter_actor_get_accessible (actor);
CallyActor *cally_actor = CALLY_ACTOR (atk_parent); CallyActorPrivate *priv = cally_actor_get_instance_private (CALLY_ACTOR (atk_parent));
CallyActorPrivate *priv = cally_actor_get_instance_private (cally_actor);
gint index; gint index;
g_return_val_if_fail (CLUTTER_IS_ACTOR (container), 0); g_return_val_if_fail (CLUTTER_IS_ACTOR (container), 0);
@ -512,12 +470,12 @@ cally_actor_real_add_actor (ClutterActor *container,
} }
static gint static gint
cally_actor_real_remove_actor (ClutterActor *container, cally_actor_remove_actor (ClutterActor *container,
ClutterActor *actor, ClutterActor *actor,
gpointer data) gpointer data)
{ {
AtkPropertyValues values = { NULL }; AtkPropertyValues values = { NULL };
AtkObject* atk_parent = NULL; AtkObject *atk_parent = NULL;
AtkObject *atk_child = NULL; AtkObject *atk_child = NULL;
CallyActorPrivate *priv = NULL; CallyActorPrivate *priv = NULL;
gint index; gint index;
@ -525,7 +483,7 @@ cally_actor_real_remove_actor (ClutterActor *container,
g_return_val_if_fail (CLUTTER_IS_ACTOR (container), 0); g_return_val_if_fail (CLUTTER_IS_ACTOR (container), 0);
g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), 0); g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), 0);
atk_parent = ATK_OBJECT (data); atk_parent = clutter_actor_get_accessible (container);
if (clutter_actor_has_accessible (actor)) if (clutter_actor_has_accessible (actor))
{ {

10
clutter/clutter/cally/cally-actor.h
View file

@ -51,8 +51,6 @@ typedef struct _CallyActorPrivate CallyActorPrivate;
/** /**
* CallyActorClass: * CallyActorClass:
* @notify_clutter: Signal handler for notify signal on Clutter actor * @notify_clutter: Signal handler for notify signal on Clutter actor
* @add_actor: Signal handler for child-added signal on Clutter actor
* @remove_actor: Signal handler for child-removed signal on Clutter actor
*/ */
struct _CallyActorClass struct _CallyActorClass
{ {
@ -62,14 +60,6 @@ struct _CallyActorClass
/*< public >*/ /*< public >*/
void (*notify_clutter) (GObject *object, void (*notify_clutter) (GObject *object,
GParamSpec *pspec); GParamSpec *pspec);
gint (*add_actor) (ClutterActor *container,
ClutterActor *actor,
gpointer data);
gint (*remove_actor) (ClutterActor *container,
ClutterActor *actor,
gpointer data);
}; };
CLUTTER_EXPORT CLUTTER_EXPORT