summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/libcss/computed.h22
-rw-r--r--include/libcss/hint.h2
-rw-r--r--include/libcss/types.h2
-rw-r--r--src/select/properties.c30
-rw-r--r--src/select/propset.h14
-rw-r--r--test/dump_computed.h2
6 files changed, 36 insertions, 36 deletions
diff --git a/include/libcss/computed.h b/include/libcss/computed.h
index 2705721..08eb77c 100644
--- a/include/libcss/computed.h
+++ b/include/libcss/computed.h
@@ -131,7 +131,7 @@ typedef struct css_computed_uncommon {
css_fixed letter_spacing;
- css_colour outline_color;
+ css_color outline_color;
css_fixed outline_width;
css_fixed word_spacing;
@@ -277,11 +277,11 @@ struct css_computed_style {
uint8_t unused[2];
- css_colour background_color;
+ css_color background_color;
lwc_string *background_image;
css_fixed background_position[2];
- css_colour border_color[4];
+ css_color border_color[4];
css_fixed border_width[4];
css_fixed top;
@@ -289,7 +289,7 @@ struct css_computed_style {
css_fixed bottom;
css_fixed left;
- css_colour color;
+ css_color color;
css_fixed font_size;
@@ -371,7 +371,7 @@ static inline uint8_t css_computed_letter_spacing(
#define OUTLINE_COLOR_SHIFT 0
#define OUTLINE_COLOR_MASK 0x3
static inline uint8_t css_computed_outline_color(
- const css_computed_style *style, css_colour *color)
+ const css_computed_style *style, css_color *color)
{
if (style->uncommon != NULL) {
uint8_t bits = style->uncommon->bits[OUTLINE_COLOR_INDEX];
@@ -854,7 +854,7 @@ static inline uint8_t css_computed_background_image(
#define COLOR_MASK 0x1
static inline uint8_t css_computed_color(
const css_computed_style *style,
- css_colour *color)
+ css_color *color)
{
uint8_t bits = style->bits[COLOR_INDEX];
bits &= COLOR_MASK;
@@ -986,7 +986,7 @@ static inline uint8_t css_computed_left(
#define BORDER_TOP_COLOR_MASK 0x3
static inline uint8_t css_computed_border_top_color(
const css_computed_style *style,
- css_colour *color)
+ css_color *color)
{
uint8_t bits = style->bits[BORDER_TOP_COLOR_INDEX];
bits &= BORDER_TOP_COLOR_MASK;
@@ -1006,7 +1006,7 @@ static inline uint8_t css_computed_border_top_color(
#define BORDER_RIGHT_COLOR_MASK 0x3
static inline uint8_t css_computed_border_right_color(
const css_computed_style *style,
- css_colour *color)
+ css_color *color)
{
uint8_t bits = style->bits[BORDER_RIGHT_COLOR_INDEX];
bits &= BORDER_RIGHT_COLOR_MASK;
@@ -1026,7 +1026,7 @@ static inline uint8_t css_computed_border_right_color(
#define BORDER_BOTTOM_COLOR_MASK 0x3
static inline uint8_t css_computed_border_bottom_color(
const css_computed_style *style,
- css_colour *color)
+ css_color *color)
{
uint8_t bits = style->bits[BORDER_BOTTOM_COLOR_INDEX];
bits &= BORDER_BOTTOM_COLOR_MASK;
@@ -1046,7 +1046,7 @@ static inline uint8_t css_computed_border_bottom_color(
#define BORDER_LEFT_COLOR_MASK 0x3
static inline uint8_t css_computed_border_left_color(
const css_computed_style *style,
- css_colour *color)
+ css_color *color)
{
uint8_t bits = style->bits[BORDER_LEFT_COLOR_INDEX];
bits &= BORDER_LEFT_COLOR_MASK;
@@ -1116,7 +1116,7 @@ static inline uint8_t css_computed_line_height(
#define BACKGROUND_COLOR_MASK 0x3
static inline uint8_t css_computed_background_color(
const css_computed_style *style,
- css_colour *color)
+ css_color *color)
{
uint8_t bits = style->bits[BACKGROUND_COLOR_INDEX];
bits &= BACKGROUND_COLOR_MASK;
diff --git a/include/libcss/hint.h b/include/libcss/hint.h
index 1aecae6..7bee217 100644
--- a/include/libcss/hint.h
+++ b/include/libcss/hint.h
@@ -41,7 +41,7 @@ typedef struct css_hint {
*/
union {
css_computed_clip_rect *clip;
- css_colour color;
+ css_color color;
css_computed_content_item *content;
css_computed_counter *counter;
int32_t integer;
diff --git a/include/libcss/types.h b/include/libcss/types.h
index 751f290..1a9fbba 100644
--- a/include/libcss/types.h
+++ b/include/libcss/types.h
@@ -69,7 +69,7 @@ typedef enum css_origin {
} css_origin;
/** CSS colour -- RRGGBBAA */
-typedef uint32_t css_colour;
+typedef uint32_t css_color;
/* CSS unit */
typedef enum css_unit {
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];
diff --git a/test/dump_computed.h b/test/dump_computed.h
index 7f3d141..45c2c75 100644
--- a/test/dump_computed.h
+++ b/test/dump_computed.h
@@ -141,7 +141,7 @@ static void dump_computed_style(const css_computed_style *style, char *buf,
char *ptr = buf;
size_t wrote = 0;
uint8_t val;
- css_colour color = 0;
+ css_color color = 0;
lwc_string *url = NULL;
css_fixed len1 = 0, len2 = 0;
css_unit unit1 = CSS_UNIT_PX, unit2 = CSS_UNIT_PX;
View Lorry Controller Status