diff options
| author | Benjamin Otte <otte@redhat.com> | 2015-01-31 11:56:15 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2015-02-06 11:26:31 +0100 |
| commit | 1116914ea03685ffbff188e48e32685a4985c2d3 (patch) | |
| tree | 13ba596816f999356a705ce410e588e7dfef56c4 /gtk/gtkcssimage.c | |
| parent | 808bfe0a98ac4cd2e11ea4eed82a66470121c19b (diff) | |
| download | gtk+-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/gtkcssimage.c')
| -rw-r--r-- | gtk/gtkcssimage.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gtk/gtkcssimage.c b/gtk/gtkcssimage.c index bdcbcf3c80..2b7cfa3c07 100644 --- a/gtk/gtkcssimage.c +++ b/gtk/gtkcssimage.c @@ -64,9 +64,8 @@ static GtkCssImage * gtk_css_image_real_compute (GtkCssImage *image, guint property_id, GtkStyleProviderPrivate *provider, - int scale, - GtkCssStyle *values, - GtkCssStyle *parent_values, + GtkCssStyle *style, + GtkCssStyle *parent_style, GtkCssDependencies *dependencies) { return g_object_ref (image); @@ -149,17 +148,16 @@ GtkCssImage * _gtk_css_image_compute (GtkCssImage *image, guint property_id, GtkStyleProviderPrivate *provider, - int scale, - GtkCssStyle *values, - GtkCssStyle *parent_values, + GtkCssStyle *style, + GtkCssStyle *parent_style, GtkCssDependencies *dependencies) { GtkCssDependencies unused; GtkCssImageClass *klass; g_return_val_if_fail (GTK_IS_CSS_IMAGE (image), NULL); - g_return_val_if_fail (GTK_IS_CSS_STYLE (values), NULL); - g_return_val_if_fail (parent_values == NULL || GTK_IS_CSS_STYLE (parent_values), NULL); + g_return_val_if_fail (GTK_IS_CSS_STYLE (style), NULL); + g_return_val_if_fail (parent_style == NULL || GTK_IS_CSS_STYLE (parent_style), NULL); if (dependencies == NULL) dependencies = &unused; @@ -167,7 +165,7 @@ _gtk_css_image_compute (GtkCssImage *image, klass = GTK_CSS_IMAGE_GET_CLASS (image); - return klass->compute (image, property_id, provider, scale, values, parent_values, dependencies); + return klass->compute (image, property_id, provider, style, parent_style, dependencies); } GtkCssImage * |