summaryrefslogtreecommitdiff
path: root/gtk/gtkcsscomputedvalues.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2012-09-16 19:07:40 +0200
committerBenjamin Otte <otte@redhat.com>2012-09-17 20:39:14 +0200
commite2cc9f3afc7a04e5d9afc319578ff42225c8be2d (patch)
tree584be4c19f7af5ee95f33e9aed3f4e8cbfc0f6f8 /gtk/gtkcsscomputedvalues.c
parentbf19d895108be6f80fd0b050b811e14cb2c885dc (diff)
downloadgtk+-e2cc9f3afc7a04e5d9afc319578ff42225c8be2d.tar.gz
csscomputedvalues: Handle starting animations differently
Diffstat (limited to 'gtk/gtkcsscomputedvalues.c')
-rw-r--r--gtk/gtkcsscomputedvalues.c29
1 files changed, 12 insertions, 17 deletions
diff --git a/gtk/gtkcsscomputedvalues.c b/gtk/gtkcsscomputedvalues.c
index 283412404d..f9ec618c97 100644
--- a/gtk/gtkcsscomputedvalues.c
+++ b/gtk/gtkcsscomputedvalues.c
@@ -364,9 +364,9 @@ gtk_css_computed_values_find_transition (GtkCssComputedValues *values,
}
static void
-gtk_css_computed_values_start_transitions (GtkCssComputedValues *values,
- gint64 timestamp,
- GtkCssComputedValues *source)
+gtk_css_computed_values_create_css_transitions (GtkCssComputedValues *values,
+ gint64 timestamp,
+ GtkCssComputedValues *source)
{
TransitionInfo transitions[GTK_CSS_PROPERTY_N_PROPERTIES] = { { 0, } };
GtkCssValue *durations, *delays, *timing_functions;
@@ -432,9 +432,9 @@ gtk_css_computed_values_find_animation (GtkCssComputedValues *values,
}
static void
-gtk_css_computed_values_start_css_animations (GtkCssComputedValues *values,
- gint64 timestamp,
- GtkStyleContext *context)
+gtk_css_computed_values_create_css_animations (GtkCssComputedValues *values,
+ gint64 timestamp,
+ GtkStyleContext *context)
{
GtkStyleProviderPrivate *provider;
GtkCssValue *durations, *delays, *timing_functions, *animations;
@@ -487,18 +487,13 @@ gtk_css_computed_values_start_css_animations (GtkCssComputedValues *values,
/* PUBLIC API */
void
-_gtk_css_computed_values_start_animations (GtkCssComputedValues *values,
- gint64 timestamp,
- GtkCssComputedValues *source,
- GtkStyleContext *context)
+_gtk_css_computed_values_create_animations (GtkCssComputedValues *values,
+ gint64 timestamp,
+ GtkCssComputedValues *source,
+ GtkStyleContext *context)
{
- GtkBitmask *ignore;
-
- gtk_css_computed_values_start_transitions (values, timestamp, source);
- gtk_css_computed_values_start_css_animations (values, timestamp, context);
-
- ignore = _gtk_css_computed_values_advance (values, timestamp);
- _gtk_bitmask_free (ignore);
+ gtk_css_computed_values_create_css_transitions (values, timestamp, source);
+ gtk_css_computed_values_create_css_animations (values, timestamp, context);
}
GtkBitmask *