From 5f19f09ac341e35bece2c22454a9384e3b79e0db Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sat, 7 Feb 2015 10:30:27 +0100 Subject: [PATCH] cssnode: Refactor gtk_css_widget_node_validate() Makes it clearer what actually happens in that function. --- gtk/gtkcsspathnode.c | 14 ++++++ gtk/gtkcsswidgetnode.c | 108 +++++++++++++++++++---------------------- 2 files changed, 64 insertions(+), 58 deletions(-) diff --git a/gtk/gtkcsspathnode.c b/gtk/gtkcsspathnode.c index aeecc4d583..a92743c3e2 100644 --- a/gtk/gtkcsspathnode.c +++ b/gtk/gtkcsspathnode.c @@ -23,6 +23,17 @@ G_DEFINE_TYPE (GtkCssPathNode, gtk_css_path_node, GTK_TYPE_CSS_NODE) +static void +gtk_css_path_node_finalize (GObject *object) +{ + GtkCssPathNode *node = GTK_CSS_PATH_NODE (object); + + if (node->path) + gtk_widget_path_unref (node->path); + + G_OBJECT_CLASS (gtk_css_path_node_parent_class)->finalize (object); +} + static void gtk_css_path_node_invalidate (GtkCssNode *node) { @@ -89,6 +100,9 @@ static void gtk_css_path_node_class_init (GtkCssPathNodeClass *klass) { GtkCssNodeClass *node_class = GTK_CSS_NODE_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = gtk_css_path_node_finalize; node_class->invalidate = gtk_css_path_node_invalidate; node_class->set_invalid = gtk_css_path_node_set_invalid; diff --git a/gtk/gtkcsswidgetnode.c b/gtk/gtkcsswidgetnode.c index f3a91a75e2..794d5de3a4 100644 --- a/gtk/gtkcsswidgetnode.c +++ b/gtk/gtkcsswidgetnode.c @@ -58,22 +58,41 @@ gtk_css_widget_node_set_invalid (GtkCssNode *node, } static gboolean -gtk_css_style_needs_full_revalidate (GtkCssStyle *style, - GtkCssChange change) +gtk_css_static_style_needs_revalidate (GtkCssStaticStyle *style, + GtkCssChange change) { /* Try to avoid invalidating if we can */ if (change & GTK_CSS_RADICAL_CHANGE) return TRUE; - if (GTK_IS_CSS_ANIMATED_STYLE (style)) - style = GTK_CSS_ANIMATED_STYLE (style)->style; - - if (gtk_css_static_style_get_change (GTK_CSS_STATIC_STYLE (style)) & change) + if (gtk_css_static_style_get_change (style) & change) return TRUE; else return FALSE; } +static GtkCssStyle * +validate_static_style (GtkCssNode *node, + GtkCssStyle *style, + GtkCssChange change, + const GtkBitmask *parent_changes) +{ + if (gtk_css_static_style_needs_revalidate (GTK_CSS_STATIC_STYLE (style), change)) + { + return gtk_css_node_create_style (node); + } + else if (!_gtk_bitmask_is_empty (parent_changes)) + { + return gtk_css_node_update_style (node, + style, + parent_changes); + } + else + { + return g_object_ref (style); + } +} + static GtkBitmask * gtk_css_widget_node_validate (GtkCssNode *node, gint64 timestamp, @@ -83,7 +102,8 @@ gtk_css_widget_node_validate (GtkCssNode *node, GtkCssWidgetNode *widget_node = GTK_CSS_WIDGET_NODE (node); GtkStyleContext *context; GtkBitmask *changes; - GtkCssStyle *style; + GtkCssStyle *style, *static_style; + GtkCssStyle *new_style, *new_static_style; if (widget_node->widget == NULL) return _gtk_bitmask_new (); @@ -92,72 +112,44 @@ gtk_css_widget_node_validate (GtkCssNode *node, style = gtk_css_node_get_style (node); if (style == NULL) style = gtk_css_static_style_get_default (); - g_object_ref (style); - /* Try to avoid invalidating if we can */ - if (gtk_css_style_needs_full_revalidate (style, change)) + if (GTK_IS_CSS_ANIMATED_STYLE (style)) { - GtkCssStyle *new_style, *static_style; - GtkCssNode *parent; + static_style = GTK_CSS_ANIMATED_STYLE (style)->style; + } + else + { + static_style = style; + } - parent = gtk_css_node_get_parent (node); + new_static_style = validate_static_style (node, static_style, change, parent_changes); - static_style = gtk_css_node_create_style (node); - new_style = gtk_css_animated_style_new (static_style, + if (new_static_style != static_style) + { + GtkCssNode *parent = gtk_css_node_get_parent (node); + new_style = gtk_css_animated_style_new (new_static_style, parent ? gtk_css_node_get_style (parent) : NULL, timestamp, gtk_css_node_get_style_provider (node), gtk_style_context_should_create_transitions (context, style) ? style : NULL); - gtk_css_node_set_style (node, new_style); - - g_object_unref (static_style); - g_object_unref (new_style); + g_object_unref (new_static_style); + } + else if (GTK_IS_CSS_ANIMATED_STYLE (style)) + { + new_style = gtk_css_animated_style_new_advance (GTK_CSS_ANIMATED_STYLE (style), + static_style, + timestamp); } else { - if (!_gtk_bitmask_is_empty (parent_changes)) - { - GtkCssStyle *new_values; - - if (GTK_IS_CSS_ANIMATED_STYLE (style)) - { - GtkCssStyle *new_base; - - new_base = gtk_css_node_update_style (node, - GTK_CSS_ANIMATED_STYLE (style)->style, - parent_changes); - new_values = gtk_css_animated_style_new_advance (GTK_CSS_ANIMATED_STYLE (style), - new_base, - timestamp); - g_object_unref (new_base); - } - else - { - new_values = gtk_css_node_update_style (node, - style, - parent_changes); - } - - gtk_css_node_set_style (node, new_values); - g_object_unref (new_values); - } - else if ((change & GTK_CSS_CHANGE_ANIMATE) && - GTK_IS_CSS_ANIMATED_STYLE (style)) - { - GtkCssStyle *new_values; - - new_values = gtk_css_animated_style_new_advance (GTK_CSS_ANIMATED_STYLE (style), - GTK_CSS_ANIMATED_STYLE (style)->style, - timestamp); - gtk_css_node_set_style (node, new_values); - g_object_unref (new_values); - } + new_style = g_object_ref (style); } - changes = gtk_css_style_get_difference (gtk_css_node_get_style (node), style); + changes = gtk_css_style_get_difference (new_style, style); - g_object_unref (style); + gtk_css_node_set_style (node, new_style); + g_object_unref (new_style); gtk_style_context_validate (context, changes);