cssvalue: Parse font sizes properly

As the last CSS property, font-size now is a proper number (when it's
not a keyword).

1 files changed, 5 insertions, 8 deletions

diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index bd22a7c1d7..3d8eb213c6 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -649,19 +649,16 @@ font_size_parse (GtkCssStyleProperty *property,
                  GtkCssParser        *parser)
 {
   GtkCssValue *value;
-  gdouble d;
 
   value = _gtk_css_font_size_value_try_parse (parser);
   if (value)
     return value;
 
-  if (!_gtk_css_parser_try_double (parser, &d))
-    {
-      _gtk_css_parser_error (parser, "Expected a number");
-      return NULL;
-    }
-
-  return _gtk_css_number_value_new (d, GTK_CSS_PX);
+  return _gtk_css_number_value_parse (parser,
+                                      GTK_CSS_PARSE_LENGTH
+                                      | GTK_CSS_PARSE_PERCENT
+                                      | GTK_CSS_POSITIVE_ONLY
+                                      | GTK_CSS_NUMBER_AS_PIXELS);
 }
 
 static GtkCssValue *