From 61489da9405ea5f3a2ea7fc8fe828f5296c1e0ea Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 22 Jan 2009 10:53:14 +0000 Subject: Handle no units in CSS as px. This is a temporary measure until the new CSS parser is used, which will handle this properly. svn path=/trunk/netsurf/; revision=6173 --- css/ruleset.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/css/ruleset.c b/css/ruleset.c index d04f62359..30d8c8ffd 100644 --- a/css/ruleset.c +++ b/css/ruleset.c @@ -658,15 +658,19 @@ int parse_length(struct css_length * const length, return 0; } - if (v->type != CSS_NODE_DIMENSION) + if (v->type != CSS_NODE_DIMENSION && v->type != CSS_NODE_NUMBER) return 1; num_length = strspn(v->data, "0123456789+-."); - u = css_unit_parse(v->data + num_length, - v->data_length - num_length); - if (u == CSS_UNIT_UNKNOWN) { - return 1; + if (v->type == CSS_NODE_DIMENSION) { + u = css_unit_parse(v->data + num_length, + v->data_length - num_length); + if (u == CSS_UNIT_UNKNOWN) { + return 1; + } + } else { + u = CSS_UNIT_PX; } value = atof(v->data); if (non_negative && value < 0) -- cgit v1.2.3