diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-01-15 17:12:51 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-01-16 17:24:34 -0500 |
commit | 105acfe90866543904467b13fecdbed108cf43b2 (patch) | |
tree | d86a719bb126eb6086260e8348466eb4a85a5e1d | |
parent | 1caf197a0db48df92b361218bba1e40ae7730faf (diff) | |
download | gtk+-105acfe90866543904467b13fecdbed108cf43b2.tar.gz |
Remove no longer used code
We no longer consult the selector tree to find changes,
so this code is no longer needed.
-rw-r--r-- | gtk/gtkcssselector.c | 68 | ||||
-rw-r--r-- | gtk/gtkcssselectorprivate.h | 2 |
2 files changed, 0 insertions, 70 deletions
diff --git a/gtk/gtkcssselector.c b/gtk/gtkcssselector.c index 8b10e5935e..e260cf159c 100644 --- a/gtk/gtkcssselector.c +++ b/gtk/gtkcssselector.c @@ -1877,80 +1877,12 @@ _gtk_css_selector_tree_match_all (const GtkCssSelectorTree *tree, return array; } -/* When checking for changes via the tree we need to know if a rule further - down the tree matched, because if so we need to add "our bit" to the - Change. For instance in a match like *.class:active we'll - get a tree that first checks :active, if that matches we continue down - to the tree, and if we get a match we add CHANGE_CLASS. However, the - end of the tree where we have a match is an ANY which doesn't actually - modify the change, so we don't know if we have a match or not. We fix - this by setting GTK_CSS_CHANGE_GOT_MATCH which lets us guarantee - that change != 0 on any match. */ -#define GTK_CSS_CHANGE_GOT_MATCH GTK_CSS_CHANGE_RESERVED_BIT - -static GtkCssChange -gtk_css_selector_tree_collect_change (const GtkCssSelectorTree *tree) -{ - GtkCssChange change = 0; - const GtkCssSelectorTree *prev; - - for (prev = gtk_css_selector_tree_get_previous (tree); - prev != NULL; - prev = gtk_css_selector_tree_get_sibling (prev)) - change |= gtk_css_selector_tree_collect_change (prev); - - change = tree->selector.class->get_change (&tree->selector, change); - - return change; -} - -static GtkCssChange -gtk_css_selector_tree_get_change (const GtkCssSelectorTree *tree, - const GtkCssMatcher *matcher) -{ - GtkCssChange change = 0; - const GtkCssSelectorTree *prev; - - if (!gtk_css_selector_match (&tree->selector, matcher)) - return 0; - - if (!tree->selector.class->is_simple) - return gtk_css_selector_tree_collect_change (tree) | GTK_CSS_CHANGE_GOT_MATCH; - - for (prev = gtk_css_selector_tree_get_previous (tree); - prev != NULL; - prev = gtk_css_selector_tree_get_sibling (prev)) - change |= gtk_css_selector_tree_get_change (prev, matcher); - - if (change || gtk_css_selector_tree_get_matches (tree)) - change = tree->selector.class->get_change (&tree->selector, change & ~GTK_CSS_CHANGE_GOT_MATCH) | GTK_CSS_CHANGE_GOT_MATCH; - - return change; -} - gboolean _gtk_css_selector_tree_is_empty (const GtkCssSelectorTree *tree) { return tree == NULL; } -GtkCssChange -_gtk_css_selector_tree_get_change_all (const GtkCssSelectorTree *tree, - const GtkCssMatcher *matcher) -{ - GtkCssChange change; - - change = 0; - - /* no need to foreach here because we abort for non-simple selectors */ - for (; tree != NULL; - tree = gtk_css_selector_tree_get_sibling (tree)) - change |= gtk_css_selector_tree_get_change (tree, matcher); - - /* Never return reserved bit set */ - return change & ~GTK_CSS_CHANGE_RESERVED_BIT; -} - #ifdef PRINT_TREE static void _gtk_css_selector_tree_print (const GtkCssSelectorTree *tree, GString *str, char *prefix) diff --git a/gtk/gtkcssselectorprivate.h b/gtk/gtkcssselectorprivate.h index 6f35917c6e..7b7ba1073c 100644 --- a/gtk/gtkcssselectorprivate.h +++ b/gtk/gtkcssselectorprivate.h @@ -43,8 +43,6 @@ int _gtk_css_selector_compare (const GtkCssSelector *a, void _gtk_css_selector_tree_free (GtkCssSelectorTree *tree); GPtrArray * _gtk_css_selector_tree_match_all (const GtkCssSelectorTree *tree, const GtkCssMatcher *matcher); -GtkCssChange _gtk_css_selector_tree_get_change_all (const GtkCssSelectorTree *tree, - const GtkCssMatcher *matcher); void _gtk_css_selector_tree_match_print (const GtkCssSelectorTree *tree, GString *str); gboolean _gtk_css_selector_tree_is_empty (const GtkCssSelectorTree *tree) G_GNUC_CONST; |