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/line_height.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/line_height.c')
-rw-r--r-- | src/select/properties/line_height.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/select/properties/line_height.c b/src/select/properties/line_height.c index b52747d..24b9e80 100644 --- a/src/select/properties/line_height.c +++ b/src/select/properties/line_height.c @@ -14,7 +14,7 @@ #include "select/properties/properties.h" #include "select/properties/helpers.h" -css_error cascade_line_height(uint32_t opv, css_style *style, +css_error css__cascade_line_height(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_LINE_HEIGHT_INHERIT; @@ -41,9 +41,9 @@ css_error cascade_line_height(uint32_t opv, css_style *style, } } - unit = to_css_unit(unit); + unit = css__to_css_unit(unit); - if (outranks_existing(getOpcode(opv), isImportant(opv), state, + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, isInherit(opv))) { return set_line_height(state->computed, value, val, unit); } @@ -51,20 +51,20 @@ css_error cascade_line_height(uint32_t opv, css_style *style, return CSS_OK; } -css_error set_line_height_from_hint(const css_hint *hint, +css_error css__set_line_height_from_hint(const css_hint *hint, css_computed_style *style) { return set_line_height(style, hint->status, hint->data.length.value, hint->data.length.unit); } -css_error initial_line_height(css_select_state *state) +css_error css__initial_line_height(css_select_state *state) { return set_line_height(state->computed, CSS_LINE_HEIGHT_NORMAL, 0, CSS_UNIT_PX); } -css_error compose_line_height(const css_computed_style *parent, +css_error css__compose_line_height(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { |