cssmatcher: Inline node values into matcher

So we don't have to go through the matcher->node->decl every time

diff --git a/gtk/gtkcssmatcher.c b/gtk/gtkcssmatcher.c
index 8afdab1b26adc07fc9f6f777384913f070807960..899a7f74f64b89f40cde5ceff2cabafa07485bc1 100644 (file)
--- a/gtk/gtkcssmatcher.c
+++ b/gtk/gtkcssmatcher.c
@@ -237,21 +237,47 @@ gtk_css_matcher_node_get_previous (GtkCssMatcher       *matcher,
 static GtkStateFlags
 gtk_css_matcher_node_get_state (const GtkCssMatcher *matcher)
 {
-  return gtk_css_node_get_state (matcher->node.node);
+  return matcher->node.node_state;
 }
 
 static gboolean
 gtk_css_matcher_node_has_name (const GtkCssMatcher     *matcher,
                                /*interned*/ const char *name)
 {
-  return gtk_css_node_get_name (matcher->node.node) == name;
+  return matcher->node.node_name == name;
 }
 
 static gboolean
 gtk_css_matcher_node_has_class (const GtkCssMatcher *matcher,
                                 GQuark               class_name)
 {
-  return gtk_css_node_has_class (matcher->node.node, class_name);
+  const GQuark *classes = matcher->node.classes;
+
+  switch (matcher->node.n_classes)
+    {
+    case 3:
+      if (classes[2] == class_name)
+        return TRUE;
+      G_GNUC_FALLTHROUGH;
+
+    case 2:
+      if (classes[1] == class_name)
+        return TRUE;
+      G_GNUC_FALLTHROUGH;
+
+    case 1:
+      if (classes[0] == class_name)
+        return TRUE;
+      G_GNUC_FALLTHROUGH;
+
+    case 0:
+      return FALSE;
+
+    default:
+      return gtk_css_node_has_class (matcher->node.node, class_name);
+    }
+
+  return FALSE;
 }
 
 static gboolean
@@ -259,7 +285,7 @@ gtk_css_matcher_node_has_id (const GtkCssMatcher *matcher,
                              const char          *id)
 {
   /* assume all callers pass an interned string */
-  return gtk_css_node_get_id (matcher->node.node) == id;
+  return matcher->node.node_id == id;
 }
 
 static gboolean
@@ -325,6 +351,11 @@ _gtk_css_matcher_node_init (GtkCssMatcher *matcher,
 {
   matcher->node.klass = &GTK_CSS_MATCHER_NODE;
   matcher->node.node = node;
+  matcher->node.node_state = gtk_css_node_get_state (node);
+  matcher->node.node_name = gtk_css_node_get_name (node);
+  matcher->node.node_id = gtk_css_node_get_id (node);
+  matcher->node.classes = gtk_css_node_declaration_get_classes (gtk_css_node_get_declaration (node),
+                                                                &matcher->node.n_classes);
 }
 
 /* GTK_CSS_MATCHER_WIDGET_ANY */

diff --git a/gtk/gtkcssmatcherprivate.h b/gtk/gtkcssmatcherprivate.h
index 29890a84c566a93749ce29a6afc5a32581bde10d..a78f777abb30114859cb6b18acff3b02473995a0 100644 (file)
--- a/gtk/gtkcssmatcherprivate.h
+++ b/gtk/gtkcssmatcherprivate.h
@@ -60,6 +60,11 @@ struct _GtkCssMatcherWidgetPath {
 struct _GtkCssMatcherNode {
   const GtkCssMatcherClass *klass;
   GtkCssNode               *node;
+  GtkStateFlags             node_state;
+  const char               *node_name;
+  const char               *node_id;
+  const GQuark             *classes;
+  guint                     n_classes;
 };
 
 struct _GtkCssMatcherSuperset {