callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

css: Huge refactoring to avoid computing wrong values

Browse Source 
Here's the shortest description of the bug I can come up with:
When computing values, we have 3 kinds of dependencies:
(1) other properties ("currentColor" or em values)
(2) inherited properties ("inherit")
(3) generic things from the theme (@keyframes or @define-color)
Previously, we passed the GtkStyleContext as an argument, because it
provided these 3 things using:
(1) _gtk_style_context_peek_property()
(2) _gtk_style_context_peek_property(gtk_style_context_get_parent())
(3) context->priv->cascade

However, this makes it impossible to lookup values other than the ones
accessible via _gtk_style_context_peek_property(). And this is exactly
what we are doing in gtk_style_context_update_cache(). So when the cache
updates encountered case (1), they were looking up the values from the
wrong style data.

So this large patch essentially does nothing but replace the
context argument in all compute functions with new arguments for the 3
cases above:
(1) values
(2) parent_values
(3) provider

We apparently have a lot of computing code.
This commit is contained in:
Benjamin Otte
2012-09-28 18:02:46 +02:00
parent 0cc32eae62
commit 1454ba15ba
37 changed files with 455 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkcssstylefuncsprivate.h
View File

@ -24,14 +24,16 @@
G_BEGIN_DECLS
gboolean _gtk_css_style_parse_value (GValue *value,
GtkCssParser *parser);
void _gtk_css_style_print_value (const GValue *value,
GString *string);
GtkCssValue * _gtk_css_style_compute_value (GtkStyleContext *context,
GType target_type,
GtkCssValue *specified,
GtkCssDependencies *dependencies);
gboolean _gtk_css_style_parse_value (GValue *value,
GtkCssParser *parser);
void _gtk_css_style_print_value (const GValue *value,
GString *string);
GtkCssValue * _gtk_css_style_compute_value (GtkStyleProviderPrivate *provider,
GtkCssComputedValues *values,
GtkCssComputedValues *parent_values,
GType target_type,
GtkCssValue *specified,
GtkCssDependencies *dependencies);
G_END_DECLS