diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-01-05 00:44:04 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-01-05 00:44:04 +0000 |
commit | 4860bd14179e94a7d073714c1c5b21fd9c200dd7 (patch) | |
tree | d6343a55826ee6d6ae3801c0453dcce12a0e987e /src/select/properties/font_family.c | |
parent | e094fcbc9fcf39fb2d71cd521e8076f4703fa100 (diff) | |
download | libcss-4860bd14179e94a7d073714c1c5b21fd9c200dd7.tar.gz libcss-4860bd14179e94a7d073714c1c5b21fd9c200dd7.tar.bz2 |
Simultaneously select styles for base + pseudo elements.
svn path=/trunk/libcss/; revision=11211
Diffstat (limited to 'src/select/properties/font_family.c')
-rw-r--r-- | src/select/properties/font_family.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/select/properties/font_family.c b/src/select/properties/font_family.c index fd2fa3c..a0c7609 100644 --- a/src/select/properties/font_family.c +++ b/src/select/properties/font_family.c @@ -62,13 +62,13 @@ css_error cascade_font_family(uint32_t opv, css_style *style, * first generic-family are ignored. */ /** \todo Do this at bytecode generation time? */ if (value == CSS_FONT_FAMILY_INHERIT && font != NULL) { - temp = state->result->alloc(fonts, + temp = state->computed->alloc(fonts, (n_fonts + 1) * sizeof(lwc_string *), - state->result->pw); + state->computed->pw); if (temp == NULL) { if (fonts != NULL) { - state->result->alloc(fonts, 0, - state->result->pw); + state->computed->alloc(fonts, 0, + state->computed->pw); } return CSS_NOMEM; } @@ -89,11 +89,11 @@ css_error cascade_font_family(uint32_t opv, css_style *style, if (n_fonts > 0) { lwc_string **temp; - temp = state->result->alloc(fonts, + temp = state->computed->alloc(fonts, (n_fonts + 1) * sizeof(lwc_string *), - state->result->pw); + state->computed->pw); if (temp == NULL) { - state->result->alloc(fonts, 0, state->result->pw); + state->computed->alloc(fonts, 0, state->computed->pw); return CSS_NOMEM; } @@ -106,14 +106,14 @@ css_error cascade_font_family(uint32_t opv, css_style *style, isInherit(opv))) { css_error error; - error = set_font_family(state->result, value, fonts); + error = set_font_family(state->computed, value, fonts); if (error != CSS_OK && n_fonts > 0) - state->result->alloc(fonts, 0, state->result->pw); + state->computed->alloc(fonts, 0, state->computed->pw); return error; } else { if (n_fonts > 0) - state->result->alloc(fonts, 0, state->result->pw); + state->computed->alloc(fonts, 0, state->computed->pw); } return CSS_OK; @@ -148,7 +148,7 @@ css_error initial_font_family(css_select_state *state) if (error != CSS_OK) return error; - return set_font_family_from_hint(&hint, state->result); + return set_font_family_from_hint(&hint, state->computed); } css_error compose_font_family(const css_computed_style *parent, |