diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2009-05-26 23:51:51 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-05-26 23:51:51 +0000 |
commit | ddb2f8e02ffc37999e7d32e70591778055844d1b (patch) | |
tree | e802c94411b135cefd8ad11975b9970a9d14d811 /src/parse/properties/properties.c | |
parent | 01ec9614ec99baf3887f75eef9decb7c2dea7219 (diff) | |
download | libcss-ddb2f8e02ffc37999e7d32e70591778055844d1b.tar.gz libcss-ddb2f8e02ffc37999e7d32e70591778055844d1b.tar.bz2 |
Split out margin and padding property parsers.
svn path=/trunk/libcss/; revision=7562
Diffstat (limited to 'src/parse/properties/properties.c')
-rw-r--r-- | src/parse/properties/properties.c | 198 |
1 files changed, 0 insertions, 198 deletions
diff --git a/src/parse/properties/properties.c b/src/parse/properties/properties.c index 8e84728..63fe839 100644 --- a/src/parse/properties/properties.c +++ b/src/parse/properties/properties.c @@ -119,12 +119,6 @@ const css_prop_handler property_handlers[LAST_PROP + 1 - FIRST_PROP] = parse_z_index, }; -static inline css_error parse_margin_side(css_language *c, - const parserutils_vector *vector, int *ctx, - uint16_t op, css_style **result); -static inline css_error parse_padding_side(css_language *c, - const parserutils_vector *vector, int *ctx, - uint16_t op, css_style **result); css_error parse_bottom(css_language *c, const parserutils_vector *vector, int *ctx, @@ -1203,35 +1197,6 @@ css_error parse_line_height(css_language *c, return CSS_OK; } -css_error parse_margin_bottom(css_language *c, - const parserutils_vector *vector, int *ctx, - css_style **result) -{ - return parse_margin_side(c, vector, ctx, - CSS_PROP_MARGIN_BOTTOM, result); -} - -css_error parse_margin_left(css_language *c, - const parserutils_vector *vector, int *ctx, - css_style **result) -{ - return parse_margin_side(c, vector, ctx, CSS_PROP_MARGIN_LEFT, result); -} - -css_error parse_margin_right(css_language *c, - const parserutils_vector *vector, int *ctx, - css_style **result) -{ - return parse_margin_side(c, vector, ctx, CSS_PROP_MARGIN_RIGHT, result); -} - -css_error parse_margin_top(css_language *c, - const parserutils_vector *vector, int *ctx, - css_style **result) -{ - return parse_margin_side(c, vector, ctx, CSS_PROP_MARGIN_TOP, result); -} - css_error parse_max_height(css_language *c, const parserutils_vector *vector, int *ctx, css_style **result) @@ -1605,38 +1570,6 @@ css_error parse_overflow(css_language *c, return CSS_OK; } -css_error parse_padding_bottom(css_language *c, - const parserutils_vector *vector, int *ctx, - css_style **result) -{ - return parse_padding_side(c, vector, ctx, - CSS_PROP_PADDING_BOTTOM, result); -} - -css_error parse_padding_left(css_language *c, - const parserutils_vector *vector, int *ctx, - css_style **result) -{ - return parse_padding_side(c, vector, ctx, - CSS_PROP_PADDING_LEFT, result); -} - -css_error parse_padding_right(css_language *c, - const parserutils_vector *vector, int *ctx, - css_style **result) -{ - return parse_padding_side(c, vector, ctx, - CSS_PROP_PADDING_RIGHT, result); -} - -css_error parse_padding_top(css_language *c, - const parserutils_vector *vector, int *ctx, - css_style **result) -{ - return parse_padding_side(c, vector, ctx, - CSS_PROP_PADDING_TOP, result); -} - css_error parse_page_break_after(css_language *c, const parserutils_vector *vector, int *ctx, css_style **result) @@ -2851,134 +2784,3 @@ css_error parse_z_index(css_language *c, return CSS_OK; } -css_error parse_margin_side(css_language *c, - const parserutils_vector *vector, int *ctx, - uint16_t op, css_style **result) -{ - css_error error; - const css_token *token; - uint8_t flags = 0; - uint16_t value = 0; - uint32_t opv; - css_fixed length = 0; - uint32_t unit = 0; - uint32_t required_size; - - /* length | percentage | IDENT(auto, inherit) */ - token = parserutils_vector_peek(vector, *ctx); - if (token == NULL) - return CSS_INVALID; - - if (token->type == CSS_TOKEN_IDENT && - token->ilower == c->strings[INHERIT]) { - parserutils_vector_iterate(vector, ctx); - flags = FLAG_INHERIT; - } else if (token->type == CSS_TOKEN_IDENT && - token->ilower == c->strings[AUTO]) { - parserutils_vector_iterate(vector, ctx); - value = MARGIN_AUTO; - } else { - error = parse_unit_specifier(c, vector, ctx, UNIT_PX, - &length, &unit); - if (error != CSS_OK) - return error; - - if (unit & UNIT_ANGLE || unit & UNIT_TIME || unit & UNIT_FREQ) - return CSS_INVALID; - - value = MARGIN_SET; - } - - error = parse_important(c, vector, ctx, &flags); - if (error != CSS_OK) - return error; - - opv = buildOPV(op, flags, value); - - required_size = sizeof(opv); - if ((flags & FLAG_INHERIT) == false && value == MARGIN_SET) - required_size += sizeof(length) + sizeof(unit); - - /* Allocate result */ - error = css_stylesheet_style_create(c->sheet, required_size, result); - if (error != CSS_OK) - return error; - - /* Copy the bytecode to it */ - memcpy((*result)->bytecode, &opv, sizeof(opv)); - if ((flags & FLAG_INHERIT) == false && value == MARGIN_SET) { - memcpy(((uint8_t *) (*result)->bytecode) + sizeof(opv), - &length, sizeof(length)); - memcpy(((uint8_t *) (*result)->bytecode) + sizeof(opv) + - sizeof(length), &unit, sizeof(unit)); - } - - return CSS_OK; -} - -css_error parse_padding_side(css_language *c, - const parserutils_vector *vector, int *ctx, - uint16_t op, css_style **result) -{ - css_error error; - const css_token *token; - uint8_t flags = 0; - uint16_t value = 0; - uint32_t opv; - css_fixed length = 0; - uint32_t unit = 0; - uint32_t required_size; - - /* length | percentage | IDENT(inherit) */ - token = parserutils_vector_peek(vector, *ctx); - if (token == NULL) - return CSS_INVALID; - - if (token->type == CSS_TOKEN_IDENT && - token->ilower == c->strings[INHERIT]) { - parserutils_vector_iterate(vector, ctx); - flags = FLAG_INHERIT; - } else { - error = parse_unit_specifier(c, vector, ctx, UNIT_PX, - &length, &unit); - if (error != CSS_OK) - return error; - - if (unit & UNIT_ANGLE || unit & UNIT_TIME || unit & UNIT_FREQ) - return CSS_INVALID; - - /* Negative lengths are invalid */ - if (length < 0) - return CSS_INVALID; - - value = PADDING_SET; - } - - error = parse_important(c, vector, ctx, &flags); - if (error != CSS_OK) - return error; - - opv = buildOPV(op, flags, value); - - required_size = sizeof(opv); - if ((flags & FLAG_INHERIT) == false && value == PADDING_SET) - required_size += sizeof(length) + sizeof(unit); - - /* Allocate result */ - error = css_stylesheet_style_create(c->sheet, required_size, result); - if (error != CSS_OK) - return error; - - /* Copy the bytecode to it */ - memcpy((*result)->bytecode, &opv, sizeof(opv)); - if ((flags & FLAG_INHERIT) == false && value == PADDING_SET) { - memcpy(((uint8_t *) (*result)->bytecode) + sizeof(opv), - &length, sizeof(length)); - memcpy(((uint8_t *) (*result)->bytecode) + sizeof(opv) + - sizeof(length), &unit, sizeof(unit)); - } - - return CSS_OK; -} - - |