Rename property to be more neutral

[~andy/gtk] / gtk / gtkcsstypedvalue.c

diff --git a/gtk/gtkcsstypedvalue.c b/gtk/gtkcsstypedvalue.c
index eb98684d4071bf9730fcb123a6afdf505507ee76..aecee31d738d33a2bb0636874e4546f439f930ce 100644 (file)
--- a/gtk/gtkcsstypedvalue.c
+++ b/gtk/gtkcsstypedvalue.c
@@ -19,6 +19,7 @@
 
 #include "gtkcsstypedvalueprivate.h"
 
+#include "gtkcsscustompropertyprivate.h"
 #include "gtkcssstylefuncsprivate.h"
 
 struct _GtkCssValue {
@@ -34,11 +35,16 @@ gtk_css_value_typed_free (GtkCssValue *value)
 }
 
 static GtkCssValue *
-gtk_css_value_typed_compute (GtkCssValue     *value,
-                             guint            property_id,
-                             GtkStyleContext *context)
+gtk_css_value_typed_compute (GtkCssValue             *value,
+                             guint                    property_id,
+                             GtkStyleProviderPrivate *provider,
+                             GtkCssComputedValues    *values,
+                             GtkCssComputedValues    *parent_values,
+                             GtkCssDependencies      *dependencies)
 {
-  return _gtk_css_value_ref (value);
+  GtkCssCustomProperty *custom = GTK_CSS_CUSTOM_PROPERTY (_gtk_css_style_property_lookup_by_id (property_id));
+
+  return _gtk_css_style_compute_value (provider, values, parent_values, custom->pspec->value_type, value, dependencies);
 }
 
 static gboolean
@@ -51,6 +57,7 @@ gtk_css_value_typed_equal (const GtkCssValue *value1,
 static GtkCssValue *
 gtk_css_value_typed_transition (GtkCssValue *start,
                                 GtkCssValue *end,
+                                guint        property_id,
                                 double       progress)
 {
   return NULL;