summaryrefslogtreecommitdiff
path: root/gtk/gtkcsscornervalue.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2012-09-28 18:02:46 +0200
committerBenjamin Otte <otte@redhat.com>2012-09-28 18:27:49 +0200
commit1454ba15baa2e3378c48566746de3f41da6cde95 (patch)
tree8be361cd7f5af95823c03957a40b8ea9ffabd37f /gtk/gtkcsscornervalue.c
parent0cc32eae6219599882e7dc75115050ce77607887 (diff)
downloadgtk+-1454ba15baa2e3378c48566746de3f41da6cde95.tar.gz
css: Huge refactoring to avoid computing wrong values
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.
Diffstat (limited to 'gtk/gtkcsscornervalue.c')
-rw-r--r--gtk/gtkcsscornervalue.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/gtk/gtkcsscornervalue.c b/gtk/gtkcsscornervalue.c
index 48586dfa12..394675c71a 100644
--- a/gtk/gtkcsscornervalue.c
+++ b/gtk/gtkcsscornervalue.c
@@ -37,16 +37,18 @@ gtk_css_value_corner_free (GtkCssValue *value)
}
static GtkCssValue *
-gtk_css_value_corner_compute (GtkCssValue *corner,
- guint property_id,
- GtkStyleContext *context,
- GtkCssDependencies *dependencies)
+gtk_css_value_corner_compute (GtkCssValue *corner,
+ guint property_id,
+ GtkStyleProviderPrivate *provider,
+ GtkCssComputedValues *values,
+ GtkCssComputedValues *parent_values,
+ GtkCssDependencies *dependencies)
{
GtkCssValue *x, *y;
GtkCssDependencies x_deps, y_deps;
- x = _gtk_css_value_compute (corner->x, property_id, context, &x_deps);
- y = _gtk_css_value_compute (corner->y, property_id, context, &y_deps);
+ x = _gtk_css_value_compute (corner->x, property_id, provider, values, parent_values, &x_deps);
+ y = _gtk_css_value_compute (corner->y, property_id, provider, values, parent_values, &y_deps);
*dependencies = _gtk_css_dependencies_union (x_deps, y_deps);
if (x == corner->x && y == corner->y)
{