diff options
Diffstat (limited to 'src/select')
-rw-r--r-- | src/select/properties.c | 30 | ||||
-rw-r--r-- | src/select/propset.h | 14 |
2 files changed, 22 insertions, 22 deletions
diff --git a/src/select/properties.c b/src/select/properties.c index 15062a5..cabac2b 100644 --- a/src/select/properties.c +++ b/src/select/properties.c @@ -15,7 +15,7 @@ static css_error cascade_bg_border_color(uint32_t opv, css_style *style, css_select_state *state, - css_error (*fun)(css_computed_style *, uint8_t, css_colour)); + css_error (*fun)(css_computed_style *, uint8_t, css_color)); static css_error cascade_uri_none(uint32_t opv, css_style *style, css_select_state *state, css_error (*fun)(css_computed_style *, uint8_t, @@ -194,7 +194,7 @@ css_error compose_background_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { - css_colour color; + css_color color; if (css_computed_background_color(child, &color) == CSS_BACKGROUND_COLOR_INHERIT) { @@ -526,7 +526,7 @@ css_error compose_border_top_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { - css_colour color; + css_color color; if (css_computed_border_top_color(child, &color) == CSS_BORDER_COLOR_INHERIT) { @@ -560,7 +560,7 @@ css_error compose_border_right_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { - css_colour color; + css_color color; if (css_computed_border_right_color(child, &color) == CSS_BORDER_COLOR_INHERIT) { @@ -594,7 +594,7 @@ css_error compose_border_bottom_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { - css_colour color; + css_color color; if (css_computed_border_bottom_color(child, &color) == CSS_BORDER_COLOR_INHERIT) { @@ -628,7 +628,7 @@ css_error compose_border_left_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { - css_colour color; + css_color color; if (css_computed_border_left_color(child, &color) == CSS_BORDER_COLOR_INHERIT) { @@ -1139,11 +1139,11 @@ css_error cascade_color(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_COLOR_INHERIT; - css_colour color = 0; + css_color color = 0; if (isInherit(opv) == false) { value = CSS_COLOR_COLOR; - color = *((css_colour *) style->bytecode); + color = *((css_color *) style->bytecode); advance_bytecode(style, sizeof(color)); } @@ -1169,7 +1169,7 @@ css_error compose_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { - css_colour color; + css_color color; if (css_computed_color(child, &color) == CSS_COLOR_INHERIT) { uint8_t p = css_computed_color(parent, &color); @@ -3224,13 +3224,13 @@ css_error cascade_outline_color(uint32_t opv, css_style *style, css_select_state *state) { uint16_t value = CSS_OUTLINE_COLOR_INHERIT; - css_colour color = 0; + css_color color = 0; if (isInherit(opv) == false) { switch (getValue(opv)) { case OUTLINE_COLOR_SET: value = CSS_OUTLINE_COLOR_COLOR; - color = *((css_colour *) style->bytecode); + color = *((css_color *) style->bytecode); advance_bytecode(style, sizeof(color)); break; case OUTLINE_COLOR_INVERT: @@ -3261,7 +3261,7 @@ css_error compose_outline_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { - css_colour color = 0; + css_color color = 0; if ((child->uncommon == NULL && parent->uncommon != NULL) || css_computed_outline_color(child, &color) == @@ -5309,10 +5309,10 @@ css_error compose_z_index(const css_computed_style *parent, ******************************************************************************/ css_error cascade_bg_border_color(uint32_t opv, css_style *style, css_select_state *state, - css_error (*fun)(css_computed_style *, uint8_t, css_colour)) + css_error (*fun)(css_computed_style *, uint8_t, css_color)) { uint16_t value = CSS_BACKGROUND_COLOR_INHERIT; - css_colour color = 0; + css_color color = 0; assert(CSS_BACKGROUND_COLOR_INHERIT == CSS_BORDER_COLOR_INHERIT); assert(CSS_BACKGROUND_COLOR_TRANSPARENT == @@ -5326,7 +5326,7 @@ css_error cascade_bg_border_color(uint32_t opv, css_style *style, break; case BACKGROUND_COLOR_SET: value = CSS_BACKGROUND_COLOR_COLOR; - color = *((css_colour *) style->bytecode); + color = *((css_color *) style->bytecode); advance_bytecode(style, sizeof(color)); break; } diff --git a/src/select/propset.h b/src/select/propset.h index 3862076..27860f0 100644 --- a/src/select/propset.h +++ b/src/select/propset.h @@ -56,7 +56,7 @@ static inline css_error set_letter_spacing( #define OUTLINE_COLOR_SHIFT 0 #define OUTLINE_COLOR_MASK 0x3 static inline css_error set_outline_color( - css_computed_style *style, uint8_t type, css_colour color) + css_computed_style *style, uint8_t type, css_color color) { uint8_t *bits; @@ -507,7 +507,7 @@ static inline css_error set_background_image( #define COLOR_MASK 0x1 static inline css_error set_color( css_computed_style *style, uint8_t type, - css_colour color) + css_color color) { uint8_t *bits = &style->bits[COLOR_INDEX]; @@ -637,7 +637,7 @@ static inline css_error set_left( #define BORDER_TOP_COLOR_MASK 0x3 static inline css_error set_border_top_color( css_computed_style *style, uint8_t type, - css_colour color) + css_color color) { uint8_t *bits = &style->bits[BORDER_TOP_COLOR_INDEX]; @@ -658,7 +658,7 @@ static inline css_error set_border_top_color( #define BORDER_RIGHT_COLOR_MASK 0x3 static inline css_error set_border_right_color( css_computed_style *style, uint8_t type, - css_colour color) + css_color color) { uint8_t *bits = &style->bits[BORDER_RIGHT_COLOR_INDEX]; @@ -679,7 +679,7 @@ static inline css_error set_border_right_color( #define BORDER_BOTTOM_COLOR_MASK 0x3 static inline css_error set_border_bottom_color( css_computed_style *style, uint8_t type, - css_colour color) + css_color color) { uint8_t *bits = &style->bits[BORDER_BOTTOM_COLOR_INDEX]; @@ -700,7 +700,7 @@ static inline css_error set_border_bottom_color( #define BORDER_LEFT_COLOR_MASK 0x3 static inline css_error set_border_left_color( css_computed_style *style, uint8_t type, - css_colour color) + css_color color) { uint8_t *bits = &style->bits[BORDER_LEFT_COLOR_INDEX]; @@ -763,7 +763,7 @@ static inline css_error set_line_height( #define BACKGROUND_COLOR_MASK 0x3 static inline css_error set_background_color( css_computed_style *style, uint8_t type, - css_colour color) + css_color color) { uint8_t *bits = &style->bits[BACKGROUND_COLOR_INDEX]; |