summaryrefslogtreecommitdiff
path: root/src/parse/properties/font.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-06-18 20:07:47 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-06-18 20:07:47 +0000
commit4ff509a419cf48774d31f27e11a59edef1fd52d2 (patch)
tree42b86995bf3d9bb890e20a703b94acc0f2e538da /src/parse/properties/font.c
parent2e21ea7e931bc501a6af8f1761d68407fb232731 (diff)
downloadlibcss-4ff509a419cf48774d31f27e11a59edef1fd52d2.tar.gz
libcss-4ff509a419cf48774d31f27e11a59edef1fd52d2.tar.bz2
Centralise !important handling.
Document background-attachment parser and make it behave correctly. svn path=/trunk/libcss/; revision=7856
Diffstat (limited to 'src/parse/properties/font.c')
-rw-r--r--src/parse/properties/font.c27
1 files changed, 0 insertions, 27 deletions
diff --git a/src/parse/properties/font.c b/src/parse/properties/font.c
index 1d1e37a..17cac76 100644
--- a/src/parse/properties/font.c
+++ b/src/parse/properties/font.c
@@ -154,10 +154,6 @@ css_error parse_font_family(css_language *c,
required_size += sizeof(opv);
}
- error = parse_important(c, vector, &temp_ctx, &flags);
- if (error != CSS_OK)
- return error;
-
opv = buildOPV(CSS_PROP_FONT_FAMILY, flags, value);
/* Allocate result */
@@ -366,13 +362,6 @@ css_error parse_font_family(css_language *c,
ptr += sizeof(opv);
}
- error = parse_important(c, vector, ctx, &flags);
- if (error != CSS_OK) {
- css_stylesheet_style_destroy(c->sheet, *result);
- *result = NULL;
- return error;
- }
-
return CSS_OK;
}
@@ -451,10 +440,6 @@ css_error parse_font_size(css_language *c,
value = FONT_SIZE_DIMENSION;
}
- error = parse_important(c, vector, ctx, &flags);
- if (error != CSS_OK)
- return error;
-
opv = buildOPV(CSS_PROP_FONT_SIZE, flags, value);
required_size = sizeof(opv);
@@ -493,10 +478,6 @@ css_error parse_font_style(css_language *c,
if (ident == NULL || ident->type != CSS_TOKEN_IDENT)
return CSS_INVALID;
- error = parse_important(c, vector, ctx, &flags);
- if (error != CSS_OK)
- return error;
-
if (ident->ilower == c->strings[INHERIT]) {
flags |= FLAG_INHERIT;
} else if (ident->ilower == c->strings[NORMAL]) {
@@ -536,10 +517,6 @@ css_error parse_font_variant(css_language *c,
if (ident == NULL || ident->type != CSS_TOKEN_IDENT)
return CSS_INVALID;
- error = parse_important(c, vector, ctx, &flags);
- if (error != CSS_OK)
- return error;
-
if (ident->ilower == c->strings[INHERIT]) {
flags |= FLAG_INHERIT;
} else if (ident->ilower == c->strings[NORMAL]) {
@@ -579,10 +556,6 @@ css_error parse_font_weight(css_language *c,
token->type != CSS_TOKEN_NUMBER))
return CSS_INVALID;
- error = parse_important(c, vector, ctx, &flags);
- if (error != CSS_OK)
- return error;
-
if (token->ilower == c->strings[INHERIT]) {
flags |= FLAG_INHERIT;
} else if (token->type == CSS_TOKEN_NUMBER) {