cssnumbervalue: Move early-out code to GtkCssValue

These checks make sense for all css values.

diff --git a/gtk/gtkcssnumbervalue.c b/gtk/gtkcssnumbervalue.c
index 83fa257f01eca4b7dc194b72c4af9b40a1750f06..508ba35c99fd30856e76a5288d1e9adbcb06b37d 100644 (file)
--- a/gtk/gtkcssnumbervalue.c
+++ b/gtk/gtkcssnumbervalue.c
@@ -115,12 +115,6 @@ gtk_css_number_value_transition (GtkCssValue *start,
 {
   GtkCssValue *result, *mul_start, *mul_end;
 
-  if (progress == 0)
-    return _gtk_css_value_ref (start);
-
-  if (progress == 1)
-    return _gtk_css_value_ref (end);
-
   if (start == end)
     return _gtk_css_value_ref (start);
 

diff --git a/gtk/gtkcssvalue.c b/gtk/gtkcssvalue.c
index 88711c0f1e980e82d4f5f1c698beb5f64934f9e5..f4a1b27d1024b33db4443938858fde565828ca9d 100644 (file)
--- a/gtk/gtkcssvalue.c
+++ b/gtk/gtkcssvalue.c
@@ -266,6 +266,9 @@ _gtk_css_value_transition (GtkCssValue *start,
   if (progress == 1)
     return _gtk_css_value_ref (end);
 
+  if (start == end)
+    return _gtk_css_value_ref (start);
+
 #ifdef CSS_VALUE_ACCOUNTING
   get_accounting_data (start->class->type_name)->transitioned++;
 #endif