callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cssnode: Implement refcounting

Browse Source 
The parent refs the child, so gtk_css_node_set_parent() adds/removes a
reference.

We should probably refactor this so that we name the function
parent.add(node) instead of node.set_parent(parent) - makes the
refcounting more clear.
This commit is contained in:
Benjamin Otte
2015-01-26 06:13:01 +01:00
parent 721dce73e0
commit a589f98821
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkcssnode.c
View File

@ -23,6 +23,19 @@
G_DEFINE_TYPE (GtkCssNode, gtk_css_node, G_TYPE_OBJECT) G_DEFINE_TYPE (GtkCssNode, gtk_css_node, G_TYPE_OBJECT)
static void
gtk_css_node_dispose (GObject *object)
{
GtkCssNode *cssnode = GTK_CSS_NODE (object);
while (cssnode->first_child)
{
gtk_css_node_set_parent (cssnode->first_child, NULL);
}
G_OBJECT_CLASS (gtk_css_node_parent_class)->dispose (object);
}
static void static void
gtk_css_node_finalize (GObject *object) gtk_css_node_finalize (GObject *object)
{ {
@ -58,6 +71,7 @@ gtk_css_node_class_init (GtkCssNodeClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = gtk_css_node_dispose;
object_class->finalize = gtk_css_node_finalize; object_class->finalize = gtk_css_node_finalize;
klass->invalidate = gtk_css_node_real_invalidate; klass->invalidate = gtk_css_node_real_invalidate;
@ -78,6 +92,9 @@ gtk_css_node_set_parent (GtkCssNode *node,
if (node->parent == parent) if (node->parent == parent)
return; return;
/* Take a reference here so the whole function has a reference */
g_object_ref (node);
if (node->parent != NULL) if (node->parent != NULL)
{ {
if (!GTK_IS_CSS_TRANSIENT_NODE (node)) if (!GTK_IS_CSS_TRANSIENT_NODE (node))
@ -98,6 +115,8 @@ gtk_css_node_set_parent (GtkCssNode *node,
node->parent = NULL; node->parent = NULL;
node->next_sibling = NULL; node->next_sibling = NULL;
node->previous_sibling = NULL; node->previous_sibling = NULL;
g_object_unref (node);
} }
if (parent) if (parent)
@ -121,6 +140,9 @@ gtk_css_node_set_parent (GtkCssNode *node,
} }
gtk_css_node_invalidate (node, GTK_CSS_CHANGE_ANY_PARENT | GTK_CSS_CHANGE_ANY_SIBLING); gtk_css_node_invalidate (node, GTK_CSS_CHANGE_ANY_PARENT | GTK_CSS_CHANGE_ANY_SIBLING);
if (node->parent == NULL)
g_object_unref (node);
} }
GtkCssNode * GtkCssNode *

2
gtk/gtkstylecontext.c
View File

@ -305,6 +305,8 @@ gtk_style_context_pop_style_node (GtkStyleContext *context)
g_return_if_fail (priv->saved_nodes != NULL); g_return_if_fail (priv->saved_nodes != NULL);
if (GTK_IS_CSS_TRANSIENT_NODE (priv->cssnode))
gtk_css_node_set_parent (priv->cssnode, NULL);
g_object_unref (priv->cssnode); g_object_unref (priv->cssnode);
priv->cssnode = priv->saved_nodes->data; priv->cssnode = priv->saved_nodes->data;
priv->saved_nodes = g_slist_remove (priv->saved_nodes, priv->cssnode); priv->saved_nodes = g_slist_remove (priv->saved_nodes, priv->cssnode);