summaryrefslogtreecommitdiff
path: root/gtk/gtkcssvalue.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2015-01-31 11:56:15 +0100
committerBenjamin Otte <otte@redhat.com>2015-02-06 11:26:31 +0100
commit1116914ea03685ffbff188e48e32685a4985c2d3 (patch)
tree13ba596816f999356a705ce410e588e7dfef56c4 /gtk/gtkcssvalue.c
parent808bfe0a98ac4cd2e11ea4eed82a66470121c19b (diff)
downloadgtk+-1116914ea03685ffbff188e48e32685a4985c2d3.tar.gz
css: Move scale to GtkStyleProviderPrivatewip/mir2
This way, we can remove it as a separate argument from gtk_css_value_compute() and allow computation to only depend on one thing: the style provider.
Diffstat (limited to 'gtk/gtkcssvalue.c')
-rw-r--r--gtk/gtkcssvalue.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/gtk/gtkcssvalue.c b/gtk/gtkcssvalue.c
index ec73f41c5d..1dc2f1ceac 100644
--- a/gtk/gtkcssvalue.c
+++ b/gtk/gtkcssvalue.c
@@ -87,23 +87,22 @@ GtkCssValue *
_gtk_css_value_compute (GtkCssValue *value,
guint property_id,
GtkStyleProviderPrivate *provider,
- int scale,
- GtkCssStyle *values,
- GtkCssStyle *parent_values,
+ GtkCssStyle *style,
+ GtkCssStyle *parent_style,
GtkCssDependencies *dependencies)
{
GtkCssDependencies fallback;
gtk_internal_return_val_if_fail (value != NULL, NULL);
gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL);
- gtk_internal_return_val_if_fail (GTK_IS_CSS_STYLE (values), NULL);
- gtk_internal_return_val_if_fail (parent_values == NULL || GTK_IS_CSS_STYLE (parent_values), NULL);
+ gtk_internal_return_val_if_fail (GTK_IS_CSS_STYLE (style), NULL);
+ gtk_internal_return_val_if_fail (parent_style == NULL || GTK_IS_CSS_STYLE (parent_style), NULL);
if (dependencies == NULL)
dependencies = &fallback;
*dependencies = 0;
- return value->class->compute (value, property_id, provider, scale, values, parent_values, dependencies);
+ return value->class->compute (value, property_id, provider, style, parent_style, dependencies);
}
gboolean