summaryrefslogtreecommitdiff
path: root/gtk/gtkcsswidgetnode.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2015-02-14 01:59:17 +0100
committerBenjamin Otte <otte@redhat.com>2015-03-18 15:23:31 +0100
commite95985da26c8fed22b9e05aa3ff9b4a5a53e3ad4 (patch)
treef97eb7efbfeefd44da94d0831621abed8f29bb55 /gtk/gtkcsswidgetnode.c
parent6f9969f4fe112006a9316575d3beeea4a4ed6c60 (diff)
downloadgtk+-e95985da26c8fed22b9e05aa3ff9b4a5a53e3ad4.tar.gz
cssstyle: Remove unused optimization
After measuring it, I realized the optimization never triggers for Adwaita and rarely ever triggers for simple themes. So it is not useful to keep it around.
Diffstat (limited to 'gtk/gtkcsswidgetnode.c')
-rw-r--r--gtk/gtkcsswidgetnode.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/gtk/gtkcsswidgetnode.c b/gtk/gtkcsswidgetnode.c
index eb640ea6ac..9a662df9b3 100644
--- a/gtk/gtkcsswidgetnode.c
+++ b/gtk/gtkcsswidgetnode.c
@@ -90,16 +90,11 @@ validate_static_style (GtkCssNode *node,
GtkCssChange change,
const GtkBitmask *parent_changes)
{
- if (gtk_css_static_style_needs_revalidate (GTK_CSS_STATIC_STYLE (style), change))
+ if (gtk_css_static_style_needs_revalidate (GTK_CSS_STATIC_STYLE (style), change) ||
+ !_gtk_bitmask_is_empty (parent_changes))
{
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);