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

csspathnode: Handle context going away

Browse Source 
Sometimes path nodes can survive longer than the style context that
created them. Don't crash in those cases.

Fixes startup of mutter.

Testcase included.

https://bugzilla.gnome.org/show_bug.cgi?id=746407
This commit is contained in:
Benjamin Otte 2015-03-18 18:22:17 +01:00
parent d55c261079
commit ec57c6c10b
4 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkcsspathnode.c
View File

@ -156,6 +156,17 @@ gtk_css_path_node_new (GtkStyleContext *context)
return GTK_CSS_NODE (node); return GTK_CSS_NODE (node);
} }
void
gtk_css_path_node_unset_context (GtkCssPathNode *node)
{
gtk_internal_return_if_fail (GTK_IS_CSS_PATH_NODE (node));
gtk_internal_return_if_fail (node->context != NULL);
node->context = NULL;
gtk_css_node_invalidate_style_provider (GTK_CSS_NODE (node));
}
void void
gtk_css_path_node_set_widget_path (GtkCssPathNode *node, gtk_css_path_node_set_widget_path (GtkCssPathNode *node,
GtkWidgetPath *path) GtkWidgetPath *path)

2
gtk/gtkcsspathnodeprivate.h
View File

@ -50,6 +50,8 @@ GType gtk_css_path_node_get_type (void) G_GNUC_CONST;
GtkCssNode * gtk_css_path_node_new (GtkStyleContext *context); GtkCssNode * gtk_css_path_node_new (GtkStyleContext *context);
void gtk_css_path_node_unset_context (GtkCssPathNode *node);
void gtk_css_path_node_set_widget_path (GtkCssPathNode *node, void gtk_css_path_node_set_widget_path (GtkCssPathNode *node,
GtkWidgetPath *path); GtkWidgetPath *path);
GtkWidgetPath * gtk_css_path_node_get_widget_path (GtkCssPathNode *node); GtkWidgetPath * gtk_css_path_node_get_widget_path (GtkCssPathNode *node);

7
gtk/gtkstylecontext.c
View File

@ -365,12 +365,15 @@ gtk_style_context_finalize (GObject *object)
style_context = GTK_STYLE_CONTEXT (object); style_context = GTK_STYLE_CONTEXT (object);
priv = style_context->priv; priv = style_context->priv;
while (priv->saved_nodes)
gtk_style_context_pop_style_node (style_context);
if (GTK_IS_CSS_PATH_NODE (priv->cssnode))
gtk_css_path_node_unset_context (GTK_CSS_PATH_NODE (priv->cssnode));
gtk_style_context_clear_parent (style_context); gtk_style_context_clear_parent (style_context);
gtk_style_context_set_cascade (style_context, NULL); gtk_style_context_set_cascade (style_context, NULL);
while (priv->saved_nodes)
gtk_style_context_pop_style_node (style_context);
g_object_unref (priv->cssnode); g_object_unref (priv->cssnode);
gtk_style_context_clear_property_cache (style_context); gtk_style_context_clear_property_cache (style_context);

15
testsuite/gtk/stylecontext.c
View File

@ -352,6 +352,20 @@ test_set_widget_path_saved (void)
g_object_unref (context); g_object_unref (context);
} }
void
test_widget_path_parent (void)
{
GtkStyleContext *parent, *context;
parent = gtk_style_context_new ();
context = gtk_style_context_new ();
gtk_style_context_set_parent (context, parent);
g_object_unref (parent);
g_object_unref (context);
}
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
@ -364,6 +378,7 @@ main (int argc, char *argv[])
g_test_add_func ("/style/basic", test_basic_properties); g_test_add_func ("/style/basic", test_basic_properties);
g_test_add_func ("/style/invalidate-saved", test_invalidate_saved); g_test_add_func ("/style/invalidate-saved", test_invalidate_saved);
g_test_add_func ("/style/set-widget-path-saved", test_set_widget_path_saved); g_test_add_func ("/style/set-widget-path-saved", test_set_widget_path_saved);
g_test_add_func ("/style/widget-path-parent", test_widget_path_parent);
return g_test_run (); return g_test_run ();
} }