From aa7c5e96a6f863888fd09c1ca07d7c4123b9cd6c Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 23 Jan 2020 02:42:01 +0100
Subject: css: Pass node through the lookup code

... instead of passing a matcher.

The matcher code is now local to the CssProvider/CssSelector machinery.
---
 gtk/gtkcssnode.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'gtk/gtkcssnode.c')

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);
-- 
cgit v1.2.1