Commit 0fdc2873 authored by Benjamin Otte's avatar Benjamin Otte

styleproperty: Simplify compute_value function

The compute_value fallback path is only needed for custom properties,
the real style properties have custom compute functions if they need
them already.
parent 7fbc583b
......@@ -91,10 +91,22 @@ _gtk_css_custom_property_class_init (GtkCssCustomPropertyClass *klass)
property_class->parse_value = gtk_css_custom_property_parse_value;
}
static GtkCssValue *
gtk_css_custom_property_compute_value (GtkCssStyleProperty *property,
GtkStyleContext *context,
GtkCssValue *specified)
{
GtkCssCustomProperty *custom = GTK_CSS_CUSTOM_PROPERTY (property);
return _gtk_css_style_compute_value (context, custom->pspec->value_type, specified);
}
static void
_gtk_css_custom_property_init (GtkCssCustomProperty *custom_property)
_gtk_css_custom_property_init (GtkCssCustomProperty *custom)
{
GtkCssStyleProperty *style = GTK_CSS_STYLE_PROPERTY (custom);
style->compute_value = gtk_css_custom_property_compute_value;
}
static GtkCssValue *
......
......@@ -303,7 +303,7 @@ gtk_css_style_property_real_compute_value (GtkCssStyleProperty *property,
GtkStyleContext *context,
GtkCssValue *specified)
{
return _gtk_css_style_compute_value (context, _gtk_css_style_property_get_computed_type (property), specified);
return _gtk_css_value_ref (specified);
}
static gboolean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment