diff options
author | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2011-01-20 11:59:46 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2011-01-20 11:59:46 +0000 |
commit | 33b37afeab6180e4fdc3c97f7f6cc713686ac6a9 (patch) | |
tree | feb641941e4fbd0db11bf70415fee5e3be50a08a /src/select/properties/color.c | |
parent | a8537a5405583a4c975b56d95cab8bdd5d406e9f (diff) | |
download | libcss-33b37afeab6180e4fdc3c97f7f6cc713686ac6a9.tar.gz libcss-33b37afeab6180e4fdc3c97f7f6cc713686ac6a9.tar.bz2 |
Ensure there are zero global symbols without css_ or css__ in front of them. This helps prevent confusion if someone else wants a function called parse_background or similar
svn path=/trunk/libcss/; revision=11416
Diffstat (limited to 'src/select/properties/color.c')
-rw-r--r-- | src/select/properties/color.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/select/properties/color.c b/src/select/properties/color.c index c246349..3cd1e3d 100644 --- a/src/select/properties/color.c +++ b/src/select/properties/color.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_color(uint32_t opv, css_style *style, +css_error css__cascade_color(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_COLOR_INHERIT; @@ -26,7 +26,7 @@ css_error cascade_color(uint32_t opv, css_style *style, advance_bytecode(style, sizeof(color)); } - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_color(state->computed, value, color); } @@ -34,13 +34,13 @@ css_error cascade_color(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_color_from_hint(const css_hint *hint, +css_error css__set_color_from_hint(const css_hint *hint, css_computed_style *style) { return set_color(style, hint->status, hint->data.color); } -css_error initial_color(css_select_state *state) +css_error css__initial_color(css_select_state *state) { css_hint hint; css_error error; @@ -50,10 +50,10 @@ css_error initial_color(css_select_state *state) if (error != CSS_OK) return error; - return set_color_from_hint(&hint, state->computed); + return css__set_color_from_hint(&hint, state->computed); } -css_error compose_color(const css_computed_style *parent, +css_error css__compose_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { |