diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-02-11 15:10:56 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-02-11 15:10:56 +0000 |
| commit | 08d4a63ce511519ed61ddf1851de630464929bd7 (patch) | |
| tree | 798b0f4d0b2e9755bcbd5dab7c579986dd0e738b /src/select/properties.c | |
| parent | 1235822bb3d22b0935a14a45e9e740fcab854eb4 (diff) | |
| download | libcss-08d4a63ce511519ed61ddf1851de630464929bd7.tar.gz libcss-08d4a63ce511519ed61ddf1851de630464929bd7.tar.bz2 | |
Change the representation of any data that includes a css_string. They're now either embedded directly in the computed style object, or are comprised of an array of objects (rather than pointers to objects)
svn path=/trunk/libcss/; revision=6432
Diffstat (limited to 'src/select/properties.c')
| -rw-r--r-- | src/select/properties.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/select/properties.c b/src/select/properties.c index cc3fda3..21ef8b5 100644 --- a/src/select/properties.c +++ b/src/select/properties.c @@ -11,7 +11,7 @@ static css_error cascade_bg_border_color(uint32_t opv, css_style *style, static css_error cascade_uri_none(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, - const css_string *)); + const parserutils_hash_entry *)); static css_error cascade_border_style(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t)); @@ -2457,7 +2457,7 @@ css_error cascade_bg_border_color(uint32_t opv, css_style *style, css_error cascade_uri_none(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, - const css_string *)) + const parserutils_hash_entry *)) { uint16_t value = CSS_BACKGROUND_IMAGE_INHERIT; parserutils_hash_entry *uri = NULL; @@ -2478,8 +2478,7 @@ css_error cascade_uri_none(uint32_t opv, css_style *style, /** \todo lose fun != NULL once all properties have set routines */ if (fun != NULL && outranks_existing(getOpcode(opv), isImportant(opv), state)) { - /** \todo fix this mess -- it's seriously unsafe */ - return fun(state->result, value, (css_string *) uri); + return fun(state->result, value, uri); } return CSS_OK; |