summaryrefslogtreecommitdiff
path: root/gtk/gtkcssnode.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2020-01-23 02:42:01 +0100
committerBenjamin Otte <otte@redhat.com>2020-01-28 02:17:02 +0100
commitaa7c5e96a6f863888fd09c1ca07d7c4123b9cd6c (patch)
tree1dd08923cc3c0c714ac0848d9b302161d3832720 /gtk/gtkcssnode.c
parent1953bc92bc21af40e45aa02eb9ce11abdc3d2a4e (diff)
downloadgtk+-aa7c5e96a6f863888fd09c1ca07d7c4123b9cd6c.tar.gz
css: Pass node through the lookup code
... instead of passing a matcher. The matcher code is now local to the CssProvider/CssSelector machinery.
Diffstat (limited to 'gtk/gtkcssnode.c')
-rw-r--r--gtk/gtkcssnode.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c
index 59e16e1495..1bf56b0646 100644
--- a/gtk/gtkcssnode.c
+++ b/gtk/gtkcssnode.c
@@ -358,8 +358,6 @@ gtk_css_node_create_style (GtkCssNode *cssnode,
GtkCssChange change)
{
const GtkCssNodeDeclaration *decl;
- GtkCssMatcher matcher;
- GtkCssStyle *parent;
GtkCssStyle *style;
GtkCssChange style_change;
@@ -371,8 +369,6 @@ gtk_css_node_create_style (GtkCssNode *cssnode,
created_styles++;
- parent = cssnode->parent ? cssnode->parent->style : NULL;
-
if (change & GTK_CSS_CHANGE_NEEDS_RECOMPUTE)
{
/* Need to recompute the change flags */
@@ -383,11 +379,8 @@ gtk_css_node_create_style (GtkCssNode *cssnode,
style_change = gtk_css_static_style_get_change (gtk_css_style_get_static_style (cssnode->style));
}
- _gtk_css_matcher_node_init (&matcher, cssnode);
-
style = gtk_css_static_style_new_compute (gtk_css_node_get_style_provider (cssnode),
- &matcher,
- parent,
+ cssnode,
style_change);
store_in_global_parent_cache (cssnode, decl, style);