diff options
author | Benjamin Otte <otte@redhat.com> | 2015-02-14 02:27:39 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2015-03-18 15:23:31 +0100 |
commit | da25771e5861440cc487c4dab37b20f1a704557b (patch) | |
tree | bde5aa8486441d14be49f7df08c8e4f4f5e0daaa /gtk/gtkcsstransformvalue.c | |
parent | e95985da26c8fed22b9e05aa3ff9b4a5a53e3ad4 (diff) | |
download | gtk+-da25771e5861440cc487c4dab37b20f1a704557b.tar.gz |
cssvalue: Remove GtkCssDependencies
They are not used anymore.
Diffstat (limited to 'gtk/gtkcsstransformvalue.c')
-rw-r--r-- | gtk/gtkcsstransformvalue.c | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/gtk/gtkcsstransformvalue.c b/gtk/gtkcsstransformvalue.c index beaf4662e5..13e9f0fcb9 100644 --- a/gtk/gtkcsstransformvalue.c +++ b/gtk/gtkcsstransformvalue.c @@ -231,12 +231,9 @@ gtk_css_transform_compute (GtkCssTransform *dest, GtkCssTransform *src, guint property_id, GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style, - GtkCssDependencies *dependencies) + GtkCssStyle *style, + GtkCssStyle *parent_style) { - GtkCssDependencies x_deps, y_deps; - dest->type = src->type; switch (src->type) @@ -244,34 +241,28 @@ gtk_css_transform_compute (GtkCssTransform *dest, case GTK_CSS_TRANSFORM_MATRIX: return TRUE; case GTK_CSS_TRANSFORM_TRANSLATE: - x_deps = y_deps = 0; - dest->translate.x = _gtk_css_value_compute (src->translate.x, property_id, provider, style, parent_style, &x_deps); - dest->translate.y = _gtk_css_value_compute (src->translate.y, property_id, provider, style, parent_style, &y_deps); - *dependencies = _gtk_css_dependencies_union (x_deps, y_deps); + dest->translate.x = _gtk_css_value_compute (src->translate.x, property_id, provider, style, parent_style); + dest->translate.y = _gtk_css_value_compute (src->translate.y, property_id, provider, style, parent_style); return dest->translate.x == src->translate.x && dest->translate.y == src->translate.y; case GTK_CSS_TRANSFORM_ROTATE: - dest->rotate.rotate = _gtk_css_value_compute (src->rotate.rotate, property_id, provider, style, parent_style, dependencies); + dest->rotate.rotate = _gtk_css_value_compute (src->rotate.rotate, property_id, provider, style, parent_style); return dest->rotate.rotate == src->rotate.rotate; case GTK_CSS_TRANSFORM_SCALE: - x_deps = y_deps = 0; - dest->scale.x = _gtk_css_value_compute (src->scale.x, property_id, provider, style, parent_style, &x_deps); - dest->scale.y = _gtk_css_value_compute (src->scale.y, property_id, provider, style, parent_style, &y_deps); - *dependencies = _gtk_css_dependencies_union (x_deps, y_deps); + dest->scale.x = _gtk_css_value_compute (src->scale.x, property_id, provider, style, parent_style); + dest->scale.y = _gtk_css_value_compute (src->scale.y, property_id, provider, style, parent_style); return dest->scale.x == src->scale.x && dest->scale.y == src->scale.y; case GTK_CSS_TRANSFORM_SKEW: - x_deps = y_deps = 0; - dest->skew.x = _gtk_css_value_compute (src->skew.x, property_id, provider, style, parent_style, &x_deps); - dest->skew.y = _gtk_css_value_compute (src->skew.y, property_id, provider, style, parent_style, &y_deps); - *dependencies = _gtk_css_dependencies_union (x_deps, y_deps); + dest->skew.x = _gtk_css_value_compute (src->skew.x, property_id, provider, style, parent_style); + dest->skew.y = _gtk_css_value_compute (src->skew.y, property_id, provider, style, parent_style); return dest->skew.x == src->skew.x && dest->skew.y == src->skew.y; case GTK_CSS_TRANSFORM_SKEW_X: - dest->skew_x.skew = _gtk_css_value_compute (src->skew_x.skew, property_id, provider, style, parent_style, dependencies); + dest->skew_x.skew = _gtk_css_value_compute (src->skew_x.skew, property_id, provider, style, parent_style); return dest->skew_x.skew == src->skew_x.skew; case GTK_CSS_TRANSFORM_SKEW_Y: - dest->skew_y.skew = _gtk_css_value_compute (src->skew_y.skew, property_id, provider, style, parent_style, dependencies); + dest->skew_y.skew = _gtk_css_value_compute (src->skew_y.skew, property_id, provider, style, parent_style); return dest->skew_y.skew == src->skew_y.skew; case GTK_CSS_TRANSFORM_NONE: default: @@ -285,10 +276,8 @@ gtk_css_value_transform_compute (GtkCssValue *value, guint property_id, GtkStyleProviderPrivate *provider, GtkCssStyle *style, - GtkCssStyle *parent_style, - GtkCssDependencies *dependencies) + GtkCssStyle *parent_style) { - GtkCssDependencies transform_deps; GtkCssValue *result; gboolean changes; guint i; @@ -307,9 +296,7 @@ gtk_css_value_transform_compute (GtkCssValue *value, property_id, provider, style, - parent_style, - &transform_deps); - *dependencies = _gtk_css_dependencies_union (*dependencies, transform_deps); + parent_style); } if (!changes) |