diff options
| author | Benjamin Otte <otte@redhat.com> | 2020-01-23 02:28:46 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2020-01-28 02:17:02 +0100 |
| commit | 1953bc92bc21af40e45aa02eb9ce11abdc3d2a4e (patch) | |
| tree | 6c9f12397e55d2ffe292cd4bbb24fb3d28c65574 /gtk/gtkcssnode.c | |
| parent | 98eeee5bcecbfd54986f07502ae765918ce6d0fb (diff) | |
| download | gtk+-1953bc92bc21af40e45aa02eb9ce11abdc3d2a4e.tar.gz | |
cssnode: Remove init_matcher() vfunc
It's unused.
Diffstat (limited to 'gtk/gtkcssnode.c')
| -rw-r--r-- | gtk/gtkcssnode.c | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c index 1b45366f38..59e16e1495 100644 --- a/gtk/gtkcssnode.c +++ b/gtk/gtkcssnode.c @@ -383,16 +383,12 @@ gtk_css_node_create_style (GtkCssNode *cssnode, style_change = gtk_css_static_style_get_change (gtk_css_style_get_static_style (cssnode->style)); } - if (gtk_css_node_init_matcher (cssnode, &matcher)) - style = gtk_css_static_style_new_compute (gtk_css_node_get_style_provider (cssnode), - &matcher, - parent, - style_change); - else - style = gtk_css_static_style_new_compute (gtk_css_node_get_style_provider (cssnode), - NULL, - parent, - style_change); + _gtk_css_matcher_node_init (&matcher, cssnode); + + style = gtk_css_static_style_new_compute (gtk_css_node_get_style_provider (cssnode), + &matcher, + parent, + style_change); store_in_global_parent_cache (cssnode, decl, style); @@ -488,15 +484,6 @@ gtk_css_node_real_validate (GtkCssNode *node) { } -static gboolean -gtk_css_node_real_init_matcher (GtkCssNode *cssnode, - GtkCssMatcher *matcher) -{ - _gtk_css_matcher_node_init (matcher, cssnode); - - return TRUE; -} - static GtkStyleProvider * gtk_css_node_real_get_style_provider (GtkCssNode *cssnode) { @@ -576,7 +563,6 @@ gtk_css_node_class_init (GtkCssNodeClass *klass) klass->validate = gtk_css_node_real_validate; klass->queue_validate = gtk_css_node_real_queue_validate; klass->dequeue_validate = gtk_css_node_real_dequeue_validate; - klass->init_matcher = gtk_css_node_real_init_matcher; klass->get_style_provider = gtk_css_node_real_get_style_provider; klass->get_frame_clock = gtk_css_node_real_get_frame_clock; @@ -1371,13 +1357,6 @@ gtk_css_node_validate (GtkCssNode *cssnode) } } -gboolean -gtk_css_node_init_matcher (GtkCssNode *cssnode, - GtkCssMatcher *matcher) -{ - return GTK_CSS_NODE_GET_CLASS (cssnode)->init_matcher (cssnode, matcher); -} - GtkStyleProvider * gtk_css_node_get_style_provider (GtkCssNode *cssnode) { |