[gtk/wip/matthiasc/css-values: 7/14] css: Compute selector tree changes ahead of time
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/css-values: 7/14] css: Compute selector tree changes ahead of time
- Date: Mon, 13 Jan 2020 15:16:16 +0000 (UTC)
commit 26ca8d2282e05454c62ff128a81d0e7167a0d598
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Jan 12 00:53:51 2020 -0500
css: Compute selector tree changes ahead of time
These only depend on the selector tree, so we can
compute them while constructing the tree.
gtk/gtkcssselector.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkcssselector.c b/gtk/gtkcssselector.c
index fd6b737ab6..4e237c6af2 100644
--- a/gtk/gtkcssselector.c
+++ b/gtk/gtkcssselector.c
@@ -104,6 +104,7 @@ union _GtkCssSelector
struct _GtkCssSelectorTree
{
GtkCssSelector selector;
+ GtkCssChange change;
gint32 parent_offset;
gint32 previous_offset;
gint32 sibling_offset;
@@ -1853,7 +1854,7 @@ gtk_css_selector_tree_collect_change (const GtkCssSelectorTree *tree)
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 |= prev->change;
change = tree->selector.class->get_change (&tree->selector, change);
@@ -1871,7 +1872,7 @@ gtk_css_selector_tree_get_change (const GtkCssSelectorTree *tree,
return 0;
if (!tree->selector.class->is_simple)
- return gtk_css_selector_tree_collect_change (tree) | GTK_CSS_CHANGE_GOT_MATCH;
+ return tree->change | GTK_CSS_CHANGE_GOT_MATCH;
for (prev = gtk_css_selector_tree_get_previous (tree);
prev != NULL;
@@ -2081,6 +2082,7 @@ subdivide_infos (GByteArray *array, GList *infos, gint32 parent_offset)
remaining = NULL;
tree = alloc_tree (array, &tree_offset);
+ tree->change = 0;
tree->parent_offset = parent_offset;
tree->selector = max_selector;
@@ -2190,6 +2192,20 @@ fixup_offsets (GtkCssSelectorTree *tree, guint8 *data)
}
}
+static void
+compute_change (GtkCssSelectorTree *tree)
+{
+ for (; tree != NULL;
+ tree = (GtkCssSelectorTree *)gtk_css_selector_tree_get_sibling (tree))
+ {
+ GtkCssSelectorTree *prev = (GtkCssSelectorTree *)gtk_css_selector_tree_get_previous (tree);
+
+ tree->change = gtk_css_selector_tree_collect_change (tree);
+
+ compute_change (prev);
+ }
+}
+
GtkCssSelectorTree *
_gtk_css_selector_tree_builder_build (GtkCssSelectorTreeBuilder *builder)
{
@@ -2213,6 +2229,8 @@ _gtk_css_selector_tree_builder_build (GtkCssSelectorTreeBuilder *builder)
fixup_offsets (tree, data);
+ compute_change (tree);
+
/* Convert offsets to final pointers */
for (l = builder->infos; l != NULL; l = l->next)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]