diff options
| -rw-r--r-- | include/libcss/computed.h | 20 | ||||
| -rw-r--r-- | include/libcss/properties.h | 6 | ||||
| -rw-r--r-- | include/libcss/select.h | 5 | ||||
| -rw-r--r-- | src/select/dispatch.h | 2 | ||||
| -rw-r--r-- | src/select/properties.c | 438 | ||||
| -rw-r--r-- | src/select/properties.h | 198 | ||||
| -rw-r--r-- | src/select/propset.h | 8 | ||||
| -rw-r--r-- | src/select/select.c | 8 | ||||
| -rw-r--r-- | test/data/select/tests1.dat | 16 | ||||
| -rw-r--r-- | test/dump_computed.h | 6 | ||||
| -rw-r--r-- | test/select-auto.c | 30 |
11 files changed, 404 insertions, 333 deletions
diff --git a/include/libcss/computed.h b/include/libcss/computed.h index 08eb77c..e0e3526 100644 --- a/include/libcss/computed.h +++ b/include/libcss/computed.h @@ -89,9 +89,9 @@ typedef struct css_computed_uncommon { * * Encode quotes as an array of string objects, terminated with a blank entry. * - * quotes 2 sizeof(ptr) + * quotes 1 sizeof(ptr) * --- --- - * 2 bits sizeof(ptr) bytes + * 1 bit sizeof(ptr) bytes * * Encode cursor uri(s) as an array of string objects, terminated with a * blank entry. @@ -105,7 +105,7 @@ typedef struct css_computed_uncommon { * 2 bits sizeof(ptr) * * ___ ___ - * 63 bits 40 + 5sizeof(ptr) bytes + * 62 bits 40 + 5sizeof(ptr) bytes * * 8 bytes 40 + 5sizeof(ptr) bytes * =================== @@ -118,7 +118,7 @@ typedef struct css_computed_uncommon { * 2 ooooooob outline-width | border-spacing * 3 bbbbbbbb border-spacing * 4 wwwwwwir word-spacing | counter-increment | counter-reset - * 5 uuuuuqq. cursor | quotes | <unused> + * 5 uuuuuq.. cursor | quotes | <unused> * 6 cccccccc clip * 7 cccccccc clip * 8 ccccccoo clip | content @@ -569,8 +569,8 @@ static inline uint8_t css_computed_cursor( #undef CURSOR_INDEX #define QUOTES_INDEX 4 -#define QUOTES_SHIFT 1 -#define QUOTES_MASK 0x6 +#define QUOTES_SHIFT 2 +#define QUOTES_MASK 0x4 static inline uint8_t css_computed_quotes( const css_computed_style *style, lwc_string ***quotes) @@ -580,13 +580,17 @@ static inline uint8_t css_computed_quotes( bits &= QUOTES_MASK; bits >>= QUOTES_SHIFT; - /* 2bits: type */ + /* 1bit: type */ *quotes = style->uncommon->quotes; return bits; } - return CSS_QUOTES_DEFAULT; + /** \todo This should be the UA default. Quotes probably needs moving + * into the main style block, so we don't need to look up the initial + * value after selection. + */ + return CSS_QUOTES_NONE; } #undef QUOTES_MASK #undef QUOTES_SHIFT diff --git a/include/libcss/properties.h b/include/libcss/properties.h index f496bc9..ca36544 100644 --- a/include/libcss/properties.h +++ b/include/libcss/properties.h @@ -305,8 +305,7 @@ enum css_font_family { CSS_FONT_FAMILY_SANS_SERIF = 0x2, CSS_FONT_FAMILY_CURSIVE = 0x3, CSS_FONT_FAMILY_FANTASY = 0x4, - CSS_FONT_FAMILY_MONOSPACE = 0x5, - CSS_FONT_FAMILY_DEFAULT = 0x6 + CSS_FONT_FAMILY_MONOSPACE = 0x5 }; enum css_font_size { @@ -490,8 +489,7 @@ enum css_quotes { CSS_QUOTES_INHERIT = 0x0, /* Consult pointer in struct to determine which */ CSS_QUOTES_STRING = 0x1, - CSS_QUOTES_NONE = 0x1, - CSS_QUOTES_DEFAULT = 0x2 + CSS_QUOTES_NONE = 0x1 }; enum css_right { diff --git a/include/libcss/select.h b/include/libcss/select.h index 3cdaf3c..391f393 100644 --- a/include/libcss/select.h +++ b/include/libcss/select.h @@ -64,6 +64,11 @@ typedef struct css_select_handler { css_error (*node_presentational_hint)(void *pw, void *node, uint32_t property, css_hint *hint); + + css_error (*ua_default_for_property)(void *pw, uint32_t property, + css_hint *hint); +// css_error (*ua_font_keyword_to_size)(void *pw, uint32_t keyword, +// css_hint *hint); } css_select_handler; css_error css_select_ctx_create(css_allocator_fn alloc, void *pw, diff --git a/src/select/dispatch.h b/src/select/dispatch.h index e38a89d..a824d5e 100644 --- a/src/select/dispatch.h +++ b/src/select/dispatch.h @@ -32,7 +32,7 @@ extern struct prop_table { css_select_state *state); css_error (*set_from_hint)(const css_hint *hint, css_computed_style *style); - css_error (*initial)(css_computed_style *style); + css_error (*initial)(css_select_state *state); css_error (*compose)(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); diff --git a/src/select/properties.c b/src/select/properties.c index 0fca7db..c607bf0 100644 --- a/src/select/properties.c +++ b/src/select/properties.c @@ -132,9 +132,9 @@ css_error set_azimuth_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_azimuth(css_computed_style *style) +css_error initial_azimuth(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -181,9 +181,9 @@ css_error set_background_attachment_from_hint(const css_hint *hint, return set_background_attachment(style, hint->status); } -css_error initial_background_attachment(css_computed_style *style) +css_error initial_background_attachment(css_select_state *state) { - return set_background_attachment(style, + return set_background_attachment(state->result, CSS_BACKGROUND_ATTACHMENT_SCROLL); } @@ -212,9 +212,10 @@ css_error set_background_color_from_hint(const css_hint *hint, return set_background_color(style, hint->status, hint->data.color); } -css_error initial_background_color(css_computed_style *style) +css_error initial_background_color(css_select_state *state) { - return set_background_color(style, CSS_BACKGROUND_COLOR_TRANSPARENT, 0); + return set_background_color(state->result, + CSS_BACKGROUND_COLOR_TRANSPARENT, 0); } css_error compose_background_color(const css_computed_style *parent, @@ -245,9 +246,10 @@ css_error set_background_image_from_hint(const css_hint *hint, return set_background_image(style, hint->status, hint->data.string); } -css_error initial_background_image(css_computed_style *style) +css_error initial_background_image(css_select_state *state) { - return set_background_image(style, CSS_BACKGROUND_IMAGE_NONE, NULL); + return set_background_image(state->result, + CSS_BACKGROUND_IMAGE_NONE, NULL); } css_error compose_background_image(const css_computed_style *parent, @@ -340,9 +342,10 @@ css_error set_background_position_from_hint(const css_hint *hint, hint->data.position.v.value, hint->data.position.v.unit); } -css_error initial_background_position(css_computed_style *style) +css_error initial_background_position(css_select_state *state) { - return set_background_position(style, CSS_BACKGROUND_POSITION_SET, + return set_background_position(state->result, + CSS_BACKGROUND_POSITION_SET, 0, CSS_UNIT_PCT, 0, CSS_UNIT_PCT); } @@ -403,9 +406,10 @@ css_error set_background_repeat_from_hint(const css_hint *hint, return set_background_repeat(style, hint->status); } -css_error initial_background_repeat(css_computed_style *style) +css_error initial_background_repeat(css_select_state *state) { - return set_background_repeat(style, CSS_BACKGROUND_REPEAT_REPEAT); + return set_background_repeat(state->result, + CSS_BACKGROUND_REPEAT_REPEAT); } css_error compose_background_repeat(const css_computed_style *parent, @@ -452,9 +456,9 @@ css_error set_border_collapse_from_hint(const css_hint *hint, return set_border_collapse(style, hint->status); } -css_error initial_border_collapse(css_computed_style *style) +css_error initial_border_collapse(css_select_state *state) { - return set_border_collapse(style, CSS_BORDER_COLLAPSE_SEPARATE); + return set_border_collapse(state->result, CSS_BORDER_COLLAPSE_SEPARATE); } css_error compose_border_collapse(const css_computed_style *parent, @@ -511,9 +515,9 @@ css_error set_border_spacing_from_hint(const css_hint *hint, hint->data.position.v.value, hint->data.position.v.unit); } -css_error initial_border_spacing(css_computed_style *style) +css_error initial_border_spacing(css_select_state *state) { - return set_border_spacing(style, CSS_BORDER_SPACING_SET, + return set_border_spacing(state->result, CSS_BORDER_SPACING_SET, 0, CSS_UNIT_PX, 0, CSS_UNIT_PX); } @@ -550,9 +554,9 @@ css_error set_border_top_color_from_hint(const css_hint *hint, return set_border_top_color(style, hint->status, hint->data.color); } -css_error initial_border_top_color(css_computed_style *style) +css_error initial_border_top_color(css_select_state *state) { - return set_border_top_color(style, CSS_BORDER_COLOR_INITIAL, 0); + return set_border_top_color(state->result, CSS_BORDER_COLOR_INITIAL, 0); } css_error compose_border_top_color(const css_computed_style *parent, @@ -584,9 +588,10 @@ css_error set_border_right_color_from_hint(const css_hint *hint, return set_border_right_color(style, hint->status, hint->data.color); } -css_error initial_border_right_color(css_computed_style *style) +css_error initial_border_right_color(css_select_state *state) { - return set_border_right_color(style, CSS_BORDER_COLOR_INITIAL, 0); + return set_border_right_color(state->result, + CSS_BORDER_COLOR_INITIAL, 0); } css_error compose_border_right_color(const css_computed_style *parent, @@ -618,9 +623,10 @@ css_error set_border_bottom_color_from_hint(const css_hint *hint, return set_border_bottom_color(style, hint->status, hint->data.color); } -css_error initial_border_bottom_color(css_computed_style *style) +css_error initial_border_bottom_color(css_select_state *state) { - return set_border_bottom_color(style, CSS_BORDER_COLOR_INITIAL, 0); + return set_border_bottom_color(state->result, + CSS_BORDER_COLOR_INITIAL, 0); } css_error compose_border_bottom_color(const css_computed_style *parent, @@ -652,9 +658,10 @@ css_error set_border_left_color_from_hint(const css_hint *hint, return set_border_left_color(style, hint->status, hint->data.color); } -css_error initial_border_left_color(css_computed_style *style) +css_error initial_border_left_color(css_select_state *state) { - return set_border_left_color(style, CSS_BORDER_COLOR_INITIAL, 0); + return set_border_left_color(state->result, + CSS_BORDER_COLOR_INITIAL, 0); } css_error compose_border_left_color(const css_computed_style *parent, @@ -685,9 +692,9 @@ css_error set_border_top_style_from_hint(const css_hint *hint, return set_border_top_style(style, hint->status); } -css_error initial_border_top_style(css_computed_style *style) +css_error initial_border_top_style(css_select_state *state) { - return set_border_top_style(style, CSS_BORDER_STYLE_NONE); + return set_border_top_style(state->result, CSS_BORDER_STYLE_NONE); } css_error compose_border_top_style(const css_computed_style *parent, @@ -715,9 +722,9 @@ css_error set_border_right_style_from_hint(const css_hint *hint, return set_border_right_style(style, hint->status); } -css_error initial_border_right_style(css_computed_style *style) +css_error initial_border_right_style(css_select_state *state) { - return set_border_right_style(style, CSS_BORDER_STYLE_NONE); + return set_border_right_style(state->result, CSS_BORDER_STYLE_NONE); } css_error compose_border_right_style(const css_computed_style *parent, @@ -745,9 +752,9 @@ css_error set_border_bottom_style_from_hint(const css_hint *hint, return set_border_bottom_style(style, hint->status); } -css_error initial_border_bottom_style(css_computed_style *style) +css_error initial_border_bottom_style(css_select_state *state) { - return set_border_bottom_style(style, CSS_BORDER_STYLE_NONE); + return set_border_bottom_style(state->result, CSS_BORDER_STYLE_NONE); } css_error compose_border_bottom_style(const css_computed_style *parent, @@ -775,9 +782,9 @@ css_error set_border_left_style_from_hint(const css_hint *hint, return set_border_left_style(style, hint->status); } -css_error initial_border_left_style(css_computed_style *style) +css_error initial_border_left_style(css_select_state *state) { - return set_border_left_style(style, CSS_BORDER_STYLE_NONE); + return set_border_left_style(state->result, CSS_BORDER_STYLE_NONE); } css_error compose_border_left_style(const css_computed_style *parent, @@ -806,9 +813,9 @@ css_error set_border_top_width_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_border_top_width(css_computed_style *style) +css_error initial_border_top_width(css_select_state *state) { - return set_border_top_width(style, CSS_BORDER_WIDTH_MEDIUM, + return set_border_top_width(state->result, CSS_BORDER_WIDTH_MEDIUM, 0, CSS_UNIT_PX); } @@ -843,9 +850,9 @@ css_error set_border_right_width_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_border_right_width(css_computed_style *style) +css_error initial_border_right_width(css_select_state *state) { - return set_border_right_width(style, CSS_BORDER_WIDTH_MEDIUM, + return set_border_right_width(state->result, CSS_BORDER_WIDTH_MEDIUM, 0, CSS_UNIT_PX); } @@ -880,9 +887,9 @@ css_error set_border_bottom_width_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_border_bottom_width(css_computed_style *style) +css_error initial_border_bottom_width(css_select_state *state) { - return set_border_bottom_width(style, CSS_BORDER_WIDTH_MEDIUM, + return set_border_bottom_width(state->result, CSS_BORDER_WIDTH_MEDIUM, 0, CSS_UNIT_PX); } @@ -917,9 +924,9 @@ css_error set_border_left_width_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_border_left_width(css_computed_style *style) +css_error initial_border_left_width(css_select_state *state) { - return set_border_left_width(style, CSS_BORDER_WIDTH_MEDIUM, + return set_border_left_width(state->result, CSS_BORDER_WIDTH_MEDIUM, 0, CSS_UNIT_PX); } @@ -954,9 +961,9 @@ css_error set_bottom_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_bottom(css_computed_style *style) +css_error initial_bottom(css_select_state *state) { - return set_bottom(style, CSS_BOTTOM_AUTO, 0, CSS_UNIT_PX); + return set_bottom(state->result, CSS_BOTTOM_AUTO, 0, CSS_UNIT_PX); } css_error compose_bottom(const css_computed_style *parent, @@ -1007,9 +1014,9 @@ css_error set_caption_side_from_hint(const css_hint *hint, return set_caption_side(style, hint->status); } -css_error initial_caption_side(css_computed_style *style) +css_error initial_caption_side(css_select_state *state) { - return set_caption_side(style, CSS_CAPTION_SIDE_TOP); + return set_caption_side(state->result, CSS_CAPTION_SIDE_TOP); } css_error compose_caption_side(const css_computed_style *parent, @@ -1062,9 +1069,9 @@ css_error set_clear_from_hint(const css_hint *hint, return set_clear(style, hint->status); } -css_error initial_clear(css_computed_style *style) +css_error initial_clear(css_select_state *state) { - return set_clear(style, CSS_CLEAR_NONE); + return set_clear(state->result, CSS_CLEAR_NONE); } css_error compose_clear(const css_computed_style *parent, @@ -1146,13 +1153,13 @@ css_error set_clip_from_hint(const css_hint *hint, return set_clip(style, hint->status, hint->data.clip); } -css_error initial_clip(css_computed_style *style) +css_error initial_clip(css_select_state *state) { css_computed_clip_rect rect = { 0, 0, 0, 0, CSS_UNIT_PX, CSS_UNIT_PX, CSS_UNIT_PX, CSS_UNIT_PX, false, false, false, false }; - return set_clip(style, CSS_CLIP_AUTO, &rect); + return set_clip(state->result, CSS_CLIP_AUTO, &rect); } css_error compose_clip(const css_computed_style *parent, @@ -1198,9 +1205,17 @@ css_error set_color_from_hint(const css_hint *hint, return set_color(style, hint->status, hint->data.color); } -css_error initial_color(css_computed_style *style) +css_error initial_color(css_select_state *state) { - return set_color(style, CSS_COLOR_COLOR, 0); + css_hint hint; + css_error error; + + error = state->handler->ua_default_for_property(state->pw, + CSS_PROP_COLOR, &hint); + if (error != CSS_OK) + return error; + + return set_color_from_hint(&hint, state->result); } css_error compose_color(const css_computed_style *parent, @@ -1390,9 +1405,9 @@ css_error set_content_from_hint(const css_hint *hint, return error; } -css_error initial_content(css_computed_style *style) +css_error initial_content(css_select_state *state) { - return set_content(style, CSS_CONTENT_NORMAL, NULL); + return set_content(state->result, CSS_CONTENT_NORMAL, NULL); } css_error compose_content(const css_computed_style *parent, @@ -1474,9 +1489,10 @@ css_error set_counter_increment_from_hint(const css_hint *hint, return error; } -css_error initial_counter_increment(css_computed_style *style) +css_error initial_counter_increment(css_select_state *state) { - return set_counter_increment(style, CSS_COUNTER_INCREMENT_NONE, NULL); + return set_counter_increment(state->result, + CSS_COUNTER_INCREMENT_NONE, NULL); } css_error compose_counter_increment(const css_computed_style *parent, @@ -1557,9 +1573,9 @@ css_error set_counter_reset_from_hint(const css_hint *hint, return error; } -css_error initial_counter_reset(css_computed_style *style) +css_error initial_counter_reset(css_select_state *state) { - return set_counter_reset(style, CSS_COUNTER_RESET_NONE, NULL); + return set_counter_reset(state->result, CSS_COUNTER_RESET_NONE, NULL); } css_error compose_counter_reset(const css_computed_style *parent, @@ -1618,9 +1634,9 @@ css_error set_cue_after_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_cue_after(css_computed_style *style) +css_error initial_cue_after(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -1652,9 +1668,9 @@ css_error set_cue_before_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_cue_before(css_computed_style *style) +css_error initial_cue_before(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -1825,9 +1841,9 @@ css_error set_cursor_from_hint(const css_hint *hint, return error; } -css_error initial_cursor(css_computed_style *style) +css_error initial_cursor(css_select_state *state) { - return set_cursor(style, CSS_CURSOR_AUTO, NULL); + return set_cursor(state->result, CSS_CURSOR_AUTO, NULL); } css_error compose_cursor(const css_computed_style *parent, @@ -1901,9 +1917,9 @@ css_error set_direction_from_hint(const css_hint *hint, return set_direction(style, hint->status); } -css_error initial_direction(css_computed_style *style) +css_error initial_direction(css_select_state *state) { - return set_direction(style, CSS_DIRECTION_LTR); + return set_direction(state->result, CSS_DIRECTION_LTR); } css_error compose_direction(const css_computed_style *parent, @@ -1990,9 +2006,9 @@ css_error set_display_from_hint(const css_hint *hint, return set_display(style, hint->status); } -css_error initial_display(css_computed_style *style) +css_error initial_display(css_select_state *state) { - return set_display(style, CSS_DISPLAY_INLINE); + return set_display(state->result, CSS_DISPLAY_INLINE); } css_error compose_display(const css_computed_style *parent, @@ -2052,9 +2068,9 @@ css_error set_elevation_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_elevation(css_computed_style *style) +css_error initial_elevation(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -2101,9 +2117,9 @@ css_error set_empty_cells_from_hint(const css_hint *hint, return set_empty_cells(style, hint->status); } -css_error initial_empty_cells(css_computed_style *style) +css_error initial_empty_cells(css_select_state *state) { - return set_empty_cells(style, CSS_EMPTY_CELLS_SHOW); + return set_empty_cells(state->result, CSS_EMPTY_CELLS_SHOW); } css_error compose_empty_cells(const css_computed_style *parent, @@ -2152,9 +2168,9 @@ css_error set_float_from_hint(const css_hint *hint, return set_float(style, hint->status); } -css_error initial_float(css_computed_style *style) +css_error initial_float(css_select_state *state) { - return set_float(style, CSS_FLOAT_NONE); + return set_float(state->result, CSS_FLOAT_NONE); } css_error compose_float(const css_computed_style *parent, @@ -2301,9 +2317,17 @@ css_error set_font_family_from_hint(const css_hint *hint, return error; } -css_error initial_font_family(css_computed_style *style) +css_error initial_font_family(css_select_state *state) { - return set_font_family(style, CSS_FONT_FAMILY_DEFAULT, NULL); + css_hint hint; + css_error error; + + error = state->handler->ua_default_for_property(state->pw, + CSS_PROP_FONT_FAMILY, &hint); + if (error != CSS_OK) + return error; + + return set_font_family_from_hint(&hint, state->result); } css_error compose_font_family(const css_computed_style *parent, @@ -2408,9 +2432,10 @@ css_error set_font_size_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_font_size(css_computed_style *style) +css_error initial_font_size(css_select_state *state) { - return set_font_size(style, CSS_FONT_SIZE_MEDIUM, 0, CSS_UNIT_PX); + return set_font_size(state->result, CSS_FONT_SIZE_MEDIUM, + 0, CSS_UNIT_PX); } css_error compose_font_size(const css_computed_style *parent, @@ -2463,9 +2488,9 @@ css_error set_font_style_from_hint(const css_hint *hint, return set_font_style(style, hint->status); } -css_error initial_font_style(css_computed_style *style) +css_error initial_font_style(css_select_state *state) { - return set_font_style(style, CSS_FONT_STYLE_NORMAL); + return set_font_style(state->result, CSS_FONT_STYLE_NORMAL); } css_error compose_font_style(const css_computed_style *parent, @@ -2510,9 +2535,9 @@ css_error set_font_variant_from_hint(const css_hint *hint, return set_font_variant(style, hint->status); } -css_error initial_font_variant(css_computed_style *style) +css_error initial_font_variant(css_select_state *state) { - return set_font_variant(style, CSS_FONT_VARIANT_NORMAL); + return set_font_variant(state->result, CSS_FONT_VARIANT_NORMAL); } css_error compose_font_variant(const css_computed_style *parent, @@ -2591,9 +2616,9 @@ css_error set_font_weight_from_hint(const css_hint *hint, return set_font_weight(style, hint->status); } -css_error initial_font_weight(css_computed_style *style) +css_error initial_font_weight(css_select_state *state) { - return set_font_weight(style, CSS_FONT_WEIGHT_NORMAL); + return set_font_weight(state->result, CSS_FONT_WEIGHT_NORMAL); } css_error compose_font_weight(const css_computed_style *parent, @@ -2621,9 +2646,9 @@ css_error set_height_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_height(css_computed_style *style) +css_error initial_height(css_select_state *state) { - return set_height(style, CSS_HEIGHT_AUTO, 0, CSS_UNIT_PX); + return set_height(state->result, CSS_HEIGHT_AUTO, 0, CSS_UNIT_PX); } css_error compose_height(const css_computed_style *parent, @@ -2656,9 +2681,9 @@ css_error set_left_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_left(css_computed_style *style) +css_error initial_left(css_select_state *state) { - return set_left(style, CSS_LEFT_AUTO, 0, CSS_UNIT_PX); + return set_left(state->result, CSS_LEFT_AUTO, 0, CSS_UNIT_PX); } css_error compose_left(const css_computed_style *parent, @@ -2691,9 +2716,9 @@ css_error set_letter_spacing_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_letter_spacing(css_computed_style *style) +css_error initial_letter_spacing(css_select_state *state) { - return set_letter_spacing(style, CSS_LETTER_SPACING_NORMAL, + return set_letter_spacing(state->result, CSS_LETTER_SPACING_NORMAL, 0, CSS_UNIT_PX); } @@ -2758,9 +2783,10 @@ css_error set_line_height_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_line_height(css_computed_style *style) +css_error initial_line_height(css_select_state *state) { - return set_line_height(style, CSS_LINE_HEIGHT_NORMAL, 0, CSS_UNIT_PX); + return set_line_height(state->result, CSS_LINE_HEIGHT_NORMAL, + 0, CSS_UNIT_PX); } css_error compose_line_height(const css_computed_style *parent, @@ -2792,9 +2818,10 @@ css_error set_list_style_image_from_hint(const css_hint *hint, return set_list_style_image(style, hint->status, hint->data.string); } -css_error initial_list_style_image(css_computed_style *style) +css_error initial_list_style_image(css_select_state *state) { - return set_list_style_image(style, CSS_LIST_STYLE_IMAGE_NONE, NULL); + return set_list_style_image(state->result, + CSS_LIST_STYLE_IMAGE_NONE, NULL); } css_error compose_list_style_image(const css_computed_style *parent, @@ -2844,9 +2871,10 @@ css_error set_list_style_position_from_hint(const css_hint *hint, return set_list_style_position(style, hint->status); } -css_error initial_list_style_position(css_computed_style *style) +css_error initial_list_style_position(css_select_state *state) { - return set_list_style_position(style, CSS_LIST_STYLE_POSITION_OUTSIDE); + return set_list_style_position(state->result, + CSS_LIST_STYLE_POSITION_OUTSIDE); } css_error compose_list_style_position(const css_computed_style *parent, @@ -2932,9 +2960,9 @@ css_error set_list_style_type_from_hint(const css_hint *hint, return set_list_style_type(style, hint->status); } -css_error initial_list_style_type(css_computed_style *style) +css_error initial_list_style_type(css_select_state *state) { - return set_list_style_type(style, CSS_LIST_STYLE_TYPE_DISC); + return set_list_style_type(state->result, CSS_LIST_STYLE_TYPE_DISC); } css_error compose_list_style_type(const css_computed_style *parent, @@ -2963,9 +2991,9 @@ css_error set_margin_top_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_margin_top(css_computed_style *style) +css_error initial_margin_top(css_select_state *state) { - return set_margin_top(style, CSS_MARGIN_SET, 0, CSS_UNIT_PX); + return set_margin_top(state->result, CSS_MARGIN_SET, 0, CSS_UNIT_PX); } css_error compose_margin_top(const css_computed_style *parent, @@ -2998,9 +3026,9 @@ css_error set_margin_right_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_margin_right(css_computed_style *style) +css_error initial_margin_right(css_select_state *state) { - return set_margin_right(style, CSS_MARGIN_SET, 0, CSS_UNIT_PX); + return set_margin_right(state->result, CSS_MARGIN_SET, 0, CSS_UNIT_PX); } css_error compose_margin_right(const css_computed_style *parent, @@ -3033,9 +3061,9 @@ css_error set_margin_bottom_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_margin_bottom(css_computed_style *style) +css_error initial_margin_bottom(css_select_state *state) { - return set_margin_bottom(style, CSS_MARGIN_SET, 0, CSS_UNIT_PX); + return set_margin_bottom(state->result, CSS_MARGIN_SET, 0, CSS_UNIT_PX); } css_error compose_margin_bottom(const css_computed_style *parent, @@ -3068,9 +3096,9 @@ css_error set_margin_left_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_margin_left(css_computed_style *style) +css_error initial_margin_left(css_select_state *state) { - return set_margin_left(style, CSS_MARGIN_SET, 0, CSS_UNIT_PX); + return set_margin_left(state->result, CSS_MARGIN_SET, 0, CSS_UNIT_PX); } css_error compose_margin_left(const css_computed_style *parent, @@ -3103,9 +3131,10 @@ css_error set_max_height_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_max_height(css_computed_style *style) +css_error initial_max_height(css_select_state *state) { - return set_max_height(style, CSS_MAX_HEIGHT_NONE, 0, CSS_UNIT_PX); + return set_max_height(state->result, CSS_MAX_HEIGHT_NONE, + 0, CSS_UNIT_PX); } css_error compose_max_height(const css_computed_style *parent, @@ -3138,9 +3167,9 @@ css_error set_max_width_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_max_width(css_computed_style *style) +css_error initial_max_width(css_select_state *state) { - return set_max_width(style, CSS_MAX_WIDTH_NONE, 0, CSS_UNIT_PX); + return set_max_width(state->result, CSS_MAX_WIDTH_NONE, 0, CSS_UNIT_PX); } css_error compose_max_width(const css_computed_style *parent, @@ -3173,9 +3202,10 @@ css_error set_min_height_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_min_height(css_computed_style *style) +css_error initial_min_height(css_select_state *state) { - return set_min_height(style, CSS_MIN_HEIGHT_SET, 0, CSS_UNIT_PX); + return set_min_height(state->result, CSS_MIN_HEIGHT_SET, + 0, CSS_UNIT_PX); } css_error compose_min_height(const css_computed_style *parent, @@ -3208,9 +3238,9 @@ css_error set_min_width_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_min_width(css_computed_style *style) +css_error initial_min_width(css_select_state *state) { - return set_min_width(style, CSS_MIN_WIDTH_SET, 0, CSS_UNIT_PX); + return set_min_width(state->result, CSS_MIN_WIDTH_SET, 0, CSS_UNIT_PX); } css_error compose_min_width(const css_computed_style *parent, @@ -3246,9 +3276,9 @@ css_error set_orphans_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_orphans(css_computed_style *style) +css_error initial_orphans(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -3296,9 +3326,9 @@ css_error set_outline_color_from_hint(const css_hint *hint, return set_outline_color(style, hint->status, hint->data.color); } -css_error initial_outline_color(css_computed_style *style) +css_error initial_outline_color(css_select_state *state) { - return set_outline_color(style, CSS_OUTLINE_COLOR_INVERT, 0); + return set_outline_color(state->result, CSS_OUTLINE_COLOR_INVERT, 0); } css_error compose_outline_color(const css_computed_style *parent, @@ -3330,9 +3360,9 @@ css_error set_outline_style_from_hint(const css_hint *hint, return set_outline_style(style, hint->status); } -css_error initial_outline_style(css_computed_style *style) +css_error initial_outline_style(css_select_state *state) { - return set_outline_style(style, CSS_OUTLINE_STYLE_NONE); + return set_outline_style(state->result, CSS_OUTLINE_STYLE_NONE); } css_error compose_outline_style(const css_computed_style *parent, @@ -3360,9 +3390,9 @@ css_error set_outline_width_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_outline_width(css_computed_style *style) +css_error initial_outline_width(css_select_state *state) { - return set_outline_width(style, CSS_OUTLINE_WIDTH_MEDIUM, + return set_outline_width(state->result, CSS_OUTLINE_WIDTH_MEDIUM, 0, CSS_UNIT_PX); } @@ -3421,9 +3451,9 @@ css_error set_overflow_from_hint(const css_hint *hint, return set_overflow(style, hint->status); } -css_error initial_overflow(css_computed_style *style) +css_error initial_overflow(css_select_state *state) { - return set_overflow(style, CSS_OVERFLOW_VISIBLE); + return set_overflow(state->result, CSS_OVERFLOW_VISIBLE); } css_error compose_overflow(const css_computed_style *parent, @@ -3450,9 +3480,9 @@ css_error set_padding_top_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_padding_top(css_computed_style *style) +css_error initial_padding_top(css_select_state *state) { - return set_padding_top(style, CSS_PADDING_SET, 0, CSS_UNIT_PX); + return set_padding_top(state->result, CSS_PADDING_SET, 0, CSS_UNIT_PX); } css_error compose_padding_top(const css_computed_style *parent, @@ -3485,9 +3515,10 @@ css_error set_padding_right_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_padding_right(css_computed_style *style) +css_error initial_padding_right(css_select_state *state) { - return set_padding_right(style, CSS_PADDING_SET, 0, CSS_UNIT_PX); + return set_padding_right(state->result, CSS_PADDING_SET, + 0, CSS_UNIT_PX); } css_error compose_padding_right(const css_computed_style *parent, @@ -3520,9 +3551,10 @@ css_error set_padding_bottom_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_padding_bottom(css_computed_style *style) +css_error initial_padding_bottom(css_select_state *state) { - return set_padding_bottom(style, CSS_PADDING_SET, 0, CSS_UNIT_PX); + return set_padding_bottom(state->result, CSS_PADDING_SET, + 0, CSS_UNIT_PX); } css_error compose_padding_bottom(const css_computed_style *parent, @@ -3555,9 +3587,9 @@ css_error set_padding_left_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_padding_left(css_computed_style *style) +css_error initial_padding_left(css_select_state *state) { - return set_padding_left(style, CSS_PADDING_SET, 0, CSS_UNIT_PX); + return set_padding_left(state->result, CSS_PADDING_SET, 0, CSS_UNIT_PX); } css_error compose_padding_left(const css_computed_style *parent, @@ -3593,9 +3625,9 @@ css_error set_page_break_after_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_page_break_after(css_computed_style *style) +css_error initial_page_break_after(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -3627,9 +3659,9 @@ css_error set_page_break_before_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_page_break_before(css_computed_style *style) +css_error initial_page_break_before(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -3678,9 +3710,9 @@ css_error set_page_break_inside_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_page_break_inside(css_computed_style *style) +css_error initial_page_break_inside(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -3712,9 +3744,9 @@ css_error set_pause_after_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_pause_after(css_computed_style *style) +css_error initial_pause_after(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -3746,9 +3778,9 @@ css_error set_pause_before_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_pause_before(css_computed_style *style) +css_error initial_pause_before(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -3780,9 +3812,9 @@ css_error set_pitch_range_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_pitch_range(css_computed_style *style) +css_error initial_pitch_range(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -3843,9 +3875,9 @@ css_error set_pitch_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_pitch(css_computed_style *style) +css_error initial_pitch(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -3900,9 +3932,9 @@ css_error set_play_during_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_play_during(css_computed_style *style) +css_error initial_play_during(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -3955,9 +3987,9 @@ css_error set_position_from_hint(const css_hint *hint, return set_position(style, hint->status); } -css_error initial_position(css_computed_style *style) +css_error initial_position(css_select_state *state) { - return set_position(style, CSS_POSITION_STATIC); + return set_position(state->result, CSS_POSITION_STATIC); } css_error compose_position(const css_computed_style *parent, @@ -4074,9 +4106,17 @@ css_error set_quotes_from_hint(const css_hint *hint, return error; } -css_error initial_quotes(css_computed_style *style) +css_error initial_quotes(css_select_state *state) { - return set_quotes(style, CSS_QUOTES_DEFAULT, NULL); + css_hint hint; + css_error error; + + error = state->handler->ua_default_for_property(state->pw, + CSS_PROP_QUOTES, &hint); + if (error != CSS_OK) + return error; + + return set_quotes_from_hint(&hint, state->result); } css_error compose_quotes(const css_computed_style *parent, @@ -4135,9 +4175,9 @@ css_error set_richness_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_richness(css_computed_style *style) +css_error initial_richness(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -4166,9 +4206,9 @@ css_error set_right_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_right(css_computed_style *style) +css_error initial_right(css_select_state *state) { - return set_right(style, CSS_RIGHT_AUTO, 0, CSS_UNIT_PX); + return set_right(state->result, CSS_RIGHT_AUTO, 0, CSS_UNIT_PX); } css_error compose_right(const css_computed_style *parent, @@ -4221,9 +4261,9 @@ css_error set_speak_header_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_speak_header(css_computed_style *style) +css_error initial_speak_header(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -4272,9 +4312,9 @@ css_error set_speak_numeral_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_speak_numeral(css_computed_style *style) +css_error initial_speak_numeral(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -4323,9 +4363,9 @@ css_error set_speak_punctuation_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_speak_punctuation(css_computed_style *style) +css_error initial_speak_punctuation(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -4375,9 +4415,9 @@ css_error set_speak_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_speak(css_computed_style *style) +css_error initial_speak(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -4435,9 +4475,9 @@ css_error set_speech_rate_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_speech_rate(css_computed_style *style) +css_error initial_speech_rate(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -4469,9 +4509,9 @@ css_error set_stress_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_stress(css_computed_style *style) +css_error initial_stress(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -4518,9 +4558,9 @@ css_error set_table_layout_from_hint(const css_hint *hint, return set_table_layout(style, hint->status); } -css_error initial_table_layout(css_computed_style *style) +css_error initial_table_layout(css_select_state *state) { - return set_table_layout(style, CSS_TABLE_LAYOUT_AUTO); + return set_table_layout(state->result, CSS_TABLE_LAYOUT_AUTO); } css_error compose_table_layout(const css_computed_style *parent, @@ -4572,9 +4612,9 @@ css_error set_text_align_from_hint(const css_hint *hint, return set_text_align(style, hint->status); } -css_error initial_text_align(css_computed_style *style) +css_error initial_text_align(css_select_state *state) { - return set_text_align(style, CSS_TEXT_ALIGN_DEFAULT); + return set_text_align(state->result, CSS_TEXT_ALIGN_DEFAULT); } css_error compose_text_align(const css_computed_style *parent, @@ -4625,9 +4665,9 @@ css_error set_text_decoration_from_hint(const css_hint *hint, return set_text_decoration(style, hint->status); } -css_error initial_text_decoration(css_computed_style *style) +css_error initial_text_decoration(css_select_state *state) { - return set_text_decoration(style, CSS_TEXT_DECORATION_NONE); + return set_text_decoration(state->result, CSS_TEXT_DECORATION_NONE); } css_error compose_text_decoration(const css_computed_style *parent, @@ -4656,9 +4696,10 @@ css_error set_text_indent_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_text_indent(css_computed_style *style) +css_error initial_text_indent(css_select_state *state) { - return set_text_indent(style, CSS_TEXT_INDENT_SET, 0, CSS_UNIT_PX); + return set_text_indent(state->result, CSS_TEXT_INDENT_SET, + 0, CSS_UNIT_PX); } css_error compose_text_indent(const css_computed_style *parent, @@ -4715,9 +4756,9 @@ css_error set_text_transform_from_hint(const css_hint *hint, return set_text_transform(style, hint->status); } -css_error initial_text_transform(css_computed_style *style) +css_error initial_text_transform(css_select_state *state) { - return set_text_transform(style, CSS_TEXT_TRANSFORM_NONE); + return set_text_transform(state->result, CSS_TEXT_TRANSFORM_NONE); } css_error compose_text_transform(const css_computed_style *parent, @@ -4745,9 +4786,9 @@ css_error set_top_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_top(css_computed_style *style) +css_error initial_top(css_select_state *state) { - return set_top(style, CSS_TOP_AUTO, 0, CSS_UNIT_PX); + return set_top(state->result, CSS_TOP_AUTO, 0, CSS_UNIT_PX); } css_error compose_top(const css_computed_style *parent, @@ -4801,9 +4842,9 @@ css_error set_unicode_bidi_from_hint(const css_hint *hint, return set_unicode_bidi(style, hint->status); } -css_error initial_unicode_bidi(css_computed_style *style) +css_error initial_unicode_bidi(css_select_state *state) { - return set_unicode_bidi(style, CSS_UNICODE_BIDI_NORMAL); + return set_unicode_bidi(state->result, CSS_UNICODE_BIDI_NORMAL); } css_error compose_unicode_bidi(const css_computed_style *parent, @@ -4878,9 +4919,9 @@ css_error set_vertical_align_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_vertical_align(css_computed_style *style) +css_error initial_vertical_align(css_select_state *state) { - return set_vertical_align(style, CSS_VERTICAL_ALIGN_BASELINE, + return set_vertical_align(state->result, CSS_VERTICAL_ALIGN_BASELINE, 0, CSS_UNIT_PX); } @@ -4935,9 +4976,9 @@ css_error set_visibility_from_hint(const css_hint *hint, return set_visibility(style, hint->status); } -css_error initial_visibility(css_computed_style *style) +css_error initial_visibility(css_select_state *state) { - return set_visibility(style, CSS_VISIBILITY_VISIBLE); + return set_visibility(state->result, CSS_VISIBILITY_VISIBLE); } css_error compose_visibility(const css_computed_style *parent, @@ -5052,9 +5093,9 @@ css_error set_voice_family_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_voice_family(css_computed_style *style) +css_error initial_voice_family(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -5122,9 +5163,9 @@ css_error set_volume_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_volume(css_computed_style *style) +css_error initial_volume(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -5180,9 +5221,9 @@ css_error set_white_space_from_hint(const css_hint *hint, return set_white_space(style, hint->status); } -css_error initial_white_space(css_computed_style *style) +css_error initial_white_space(css_select_state *state) { - return set_white_space(style, CSS_WHITE_SPACE_NORMAL); + return set_white_space(state->result, CSS_WHITE_SPACE_NORMAL); } css_error compose_white_space(const css_computed_style *parent, @@ -5213,9 +5254,9 @@ css_error set_widows_from_hint(const css_hint *hint, return CSS_OK; } -css_error initial_widows(css_computed_style *style) +css_error initial_widows(css_select_state *state) { - UNUSED(style); + UNUSED(state); return CSS_OK; } @@ -5244,9 +5285,9 @@ css_error set_width_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_width(css_computed_style *style) +css_error initial_width(css_select_state *state) { - return set_width(style, CSS_WIDTH_AUTO, 0, CSS_UNIT_PX); + return set_width(state->result, CSS_WIDTH_AUTO, 0, CSS_UNIT_PX); } css_error compose_width(const css_computed_style *parent, @@ -5278,9 +5319,10 @@ css_error set_word_spacing_from_hint(const css_hint *hint, hint->data.length.value, hint->data.length.unit); } -css_error initial_word_spacing(css_computed_style *style) +css_error initial_word_spacing(css_select_state *state) { - return set_word_spacing(style, CSS_WORD_SPACING_NORMAL, 0, CSS_UNIT_PX); + return set_word_spacing(state->result, CSS_WORD_SPACING_NORMAL, + 0, CSS_UNIT_PX); } css_error compose_word_spacing(const css_computed_style *parent, @@ -5334,9 +5376,9 @@ css_error set_z_index_from_hint(const css_hint *hint, return set_z_index(style, hint->status, hint->data.integer); } -css_error initial_z_index(css_computed_style *style) +css_error initial_z_index(css_select_state *state) { - return set_z_index(style, CSS_Z_INDEX_AUTO, 0); + return set_z_index(state->result, CSS_Z_INDEX_AUTO, 0); } css_error compose_z_index(const css_computed_style *parent, diff --git a/src/select/properties.h b/src/select/properties.h index 6f1f453..9c98e10 100644 --- a/src/select/properties.h +++ b/src/select/properties.h @@ -18,7 +18,7 @@ css_error cascade_azimuth(uint32_t opv, css_style *style, css_select_state *state); css_error set_azimuth_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_azimuth(css_computed_style *style); +css_error initial_azimuth(css_select_state *state); css_error compose_azimuth(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -26,7 +26,7 @@ css_error cascade_background_attachment(uint32_t opv, css_style *style, css_select_state *state); css_error set_background_attachment_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_background_attachment(css_computed_style *style); +css_error initial_background_attachment(css_select_state *state); css_error compose_background_attachment(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -34,7 +34,7 @@ css_error cascade_background_color(uint32_t opv, css_style *style, css_select_state *state); css_error set_background_color_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_background_color(css_computed_style *style); +css_error initial_background_color(css_select_state *state); css_error compose_background_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -42,7 +42,7 @@ css_error cascade_background_image(uint32_t opv, css_style *style, css_select_state *state); css_error set_background_image_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_background_image(css_computed_style *style); +css_error initial_background_image(css_select_state *state); css_error compose_background_image(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -50,7 +50,7 @@ css_error cascade_background_position(uint32_t opv, css_style *style, css_select_state *state); css_error set_background_position_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_background_position(css_computed_style *style); +css_error initial_background_position(css_select_state *state); css_error compose_background_position(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -58,7 +58,7 @@ css_error cascade_background_repeat(uint32_t opv, css_style *style, css_select_state *state); css_error set_background_repeat_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_background_repeat(css_computed_style *style); +css_error initial_background_repeat(css_select_state *state); css_error compose_background_repeat(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -66,7 +66,7 @@ css_error cascade_border_collapse(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_collapse_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_collapse(css_computed_style *style); +css_error initial_border_collapse(css_select_state *state); css_error compose_border_collapse(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -74,7 +74,7 @@ css_error cascade_border_spacing(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_spacing_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_spacing(css_computed_style *style); +css_error initial_border_spacing(css_select_state *state); css_error compose_border_spacing(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -82,7 +82,7 @@ css_error cascade_border_top_color(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_top_color_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_top_color(css_computed_style *style); +css_error initial_border_top_color(css_select_state *state); css_error compose_border_top_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -90,7 +90,7 @@ css_error cascade_border_right_color(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_right_color_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_right_color(css_computed_style *style); +css_error initial_border_right_color(css_select_state *state); css_error compose_border_right_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -98,7 +98,7 @@ css_error cascade_border_bottom_color(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_bottom_color_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_bottom_color(css_computed_style *style); +css_error initial_border_bottom_color(css_select_state *state); css_error compose_border_bottom_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -106,7 +106,7 @@ css_error cascade_border_left_color(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_left_color_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_left_color(css_computed_style *style); +css_error initial_border_left_color(css_select_state *state); css_error compose_border_left_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -114,7 +114,7 @@ css_error cascade_border_top_style(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_top_style_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_top_style(css_computed_style *style); +css_error initial_border_top_style(css_select_state *state); css_error compose_border_top_style(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -122,7 +122,7 @@ css_error cascade_border_right_style(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_right_style_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_right_style(css_computed_style *style); +css_error initial_border_right_style(css_select_state *state); css_error compose_border_right_style(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -130,7 +130,7 @@ css_error cascade_border_bottom_style(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_bottom_style_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_bottom_style(css_computed_style *style); +css_error initial_border_bottom_style(css_select_state *state); css_error compose_border_bottom_style(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -138,7 +138,7 @@ css_error cascade_border_left_style(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_left_style_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_left_style(css_computed_style *style); +css_error initial_border_left_style(css_select_state *state); css_error compose_border_left_style(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -146,7 +146,7 @@ css_error cascade_border_top_width(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_top_width_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_top_width(css_computed_style *style); +css_error initial_border_top_width(css_select_state *state); css_error compose_border_top_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -154,7 +154,7 @@ css_error cascade_border_right_width(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_right_width_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_right_width(css_computed_style *style); +css_error initial_border_right_width(css_select_state *state); css_error compose_border_right_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -162,7 +162,7 @@ css_error cascade_border_bottom_width(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_bottom_width_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_bottom_width(css_computed_style *style); +css_error initial_border_bottom_width(css_select_state *state); css_error compose_border_bottom_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -170,7 +170,7 @@ css_error cascade_border_left_width(uint32_t opv, css_style *style, css_select_state *state); css_error set_border_left_width_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_border_left_width(css_computed_style *style); +css_error initial_border_left_width(css_select_state *state); css_error compose_border_left_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -178,7 +178,7 @@ css_error cascade_bottom(uint32_t opv, css_style *style, css_select_state *state); css_error set_bottom_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_bottom(css_computed_style *style); +css_error initial_bottom(css_select_state *state); css_error compose_bottom(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -186,7 +186,7 @@ css_error cascade_caption_side(uint32_t opv, css_style *style, css_select_state *state); css_error set_caption_side_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_caption_side(css_computed_style *style); +css_error initial_caption_side(css_select_state *state); css_error compose_caption_side(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -194,7 +194,7 @@ css_error cascade_clear(uint32_t opv, css_style *style, css_select_state *state); css_error set_clear_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_clear(css_computed_style *style); +css_error initial_clear(css_select_state *state); css_error compose_clear(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -202,7 +202,7 @@ css_error cascade_clip(uint32_t opv, css_style *style, css_select_state *state); css_error set_clip_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_clip(css_computed_style *style); +css_error initial_clip(css_select_state *state); css_error compose_clip(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -210,7 +210,7 @@ css_error cascade_color(uint32_t opv, css_style *style, css_select_state *state); css_error set_color_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_color(css_computed_style *style); +css_error initial_color(css_select_state *state); css_error compose_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -218,7 +218,7 @@ css_error cascade_content(uint32_t opv, css_style *style, css_select_state *state); css_error set_content_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_content(css_computed_style *style); +css_error initial_content(css_select_state *state); css_error compose_content(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -226,7 +226,7 @@ css_error cascade_counter_increment(uint32_t opv, css_style *style, css_select_state *state); css_error set_counter_increment_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_counter_increment(css_computed_style *style); +css_error initial_counter_increment(css_select_state *state); css_error compose_counter_increment(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -234,7 +234,7 @@ css_error cascade_counter_reset(uint32_t opv, css_style *style, css_select_state *state); css_error set_counter_reset_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_counter_reset(css_computed_style *style); +css_error initial_counter_reset(css_select_state *state); css_error compose_counter_reset(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -242,7 +242,7 @@ css_error cascade_cue_after(uint32_t opv, css_style *style, css_select_state *state); css_error set_cue_after_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_cue_after(css_computed_style *style); +css_error initial_cue_after(css_select_state *state); css_error compose_cue_after(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -250,7 +250,7 @@ css_error cascade_cue_before(uint32_t opv, css_style *style, css_select_state *state); css_error set_cue_before_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_cue_before(css_computed_style *style); +css_error initial_cue_before(css_select_state *state); css_error compose_cue_before(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -258,7 +258,7 @@ css_error cascade_cursor(uint32_t opv, css_style *style, css_select_state *state); css_error set_cursor_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_cursor(css_computed_style *style); +css_error initial_cursor(css_select_state *state); css_error compose_cursor(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -266,7 +266,7 @@ css_error cascade_direction(uint32_t opv, css_style *style, css_select_state *state); css_error set_direction_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_direction(css_computed_style *style); +css_error initial_direction(css_select_state *state); css_error compose_direction(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -274,7 +274,7 @@ css_error cascade_display(uint32_t opv, css_style *style, css_select_state *state); css_error set_display_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_display(css_computed_style *style); +css_error initial_display(css_select_state *state); css_error compose_display(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -282,7 +282,7 @@ css_error cascade_elevation(uint32_t opv, css_style *style, css_select_state *state); css_error set_elevation_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_elevation(css_computed_style *style); +css_error initial_elevation(css_select_state *state); css_error compose_elevation(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -290,7 +290,7 @@ css_error cascade_empty_cells(uint32_t opv, css_style *style, css_select_state *state); css_error set_empty_cells_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_empty_cells(css_computed_style *style); +css_error initial_empty_cells(css_select_state *state); css_error compose_empty_cells(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -298,7 +298,7 @@ css_error cascade_float(uint32_t opv, css_style *style, css_select_state *state); css_error set_float_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_float(css_computed_style *style); +css_error initial_float(css_select_state *state); css_error compose_float(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -306,7 +306,7 @@ css_error cascade_font_family(uint32_t opv, css_style *style, css_select_state *state); css_error set_font_family_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_font_family(css_computed_style *style); +css_error initial_font_family(css_select_state *state); css_error compose_font_family(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -314,7 +314,7 @@ css_error cascade_font_size(uint32_t opv, css_style *style, css_select_state *state); css_error set_font_size_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_font_size(css_computed_style *style); +css_error initial_font_size(css_select_state *state); css_error compose_font_size(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -322,7 +322,7 @@ css_error cascade_font_style(uint32_t opv, css_style *style, css_select_state *state); css_error set_font_style_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_font_style(css_computed_style *style); +css_error initial_font_style(css_select_state *state); css_error compose_font_style(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -330,7 +330,7 @@ css_error cascade_font_variant(uint32_t opv, css_style *style, css_select_state *state); css_error set_font_variant_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_font_variant(css_computed_style *style); +css_error initial_font_variant(css_select_state *state); css_error compose_font_variant(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -338,7 +338,7 @@ css_error cascade_font_weight(uint32_t opv, css_style *style, css_select_state *state); css_error set_font_weight_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_font_weight(css_computed_style *style); +css_error initial_font_weight(css_select_state *state); css_error compose_font_weight(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -346,7 +346,7 @@ css_error cascade_height(uint32_t opv, css_style *style, css_select_state *state); css_error set_height_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_height(css_computed_style *style); +css_error initial_height(css_select_state *state); css_error compose_height(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -354,7 +354,7 @@ css_error cascade_left(uint32_t opv, css_style *style, css_select_state *state); css_error set_left_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_left(css_computed_style *style); +css_error initial_left(css_select_state *state); css_error compose_left(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -362,7 +362,7 @@ css_error cascade_letter_spacing(uint32_t opv, css_style *style, css_select_state *state); css_error set_letter_spacing_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_letter_spacing(css_computed_style *style); +css_error initial_letter_spacing(css_select_state *state); css_error compose_letter_spacing(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -370,7 +370,7 @@ css_error cascade_line_height(uint32_t opv, css_style *style, css_select_state *state); css_error set_line_height_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_line_height(css_computed_style *style); +css_error initial_line_height(css_select_state *state); css_error compose_line_height(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -378,7 +378,7 @@ css_error cascade_list_style_image(uint32_t opv, css_style *style, css_select_state *state); css_error set_list_style_image_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_list_style_image(css_computed_style *style); +css_error initial_list_style_image(css_select_state *state); css_error compose_list_style_image(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -386,7 +386,7 @@ css_error cascade_list_style_position(uint32_t opv, css_style *style, css_select_state *state); css_error set_list_style_position_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_list_style_position(css_computed_style *style); +css_error initial_list_style_position(css_select_state *state); css_error compose_list_style_position(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -394,7 +394,7 @@ css_error cascade_list_style_type(uint32_t opv, css_style *style, css_select_state *state); css_error set_list_style_type_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_list_style_type(css_computed_style *style); +css_error initial_list_style_type(css_select_state *state); css_error compose_list_style_type(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -402,7 +402,7 @@ css_error cascade_margin_top(uint32_t opv, css_style *style, css_select_state *state); css_error set_margin_top_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_margin_top(css_computed_style *style); +css_error initial_margin_top(css_select_state *state); css_error compose_margin_top(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -410,7 +410,7 @@ css_error cascade_margin_right(uint32_t opv, css_style *style, css_select_state *state); css_error set_margin_right_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_margin_right(css_computed_style *style); +css_error initial_margin_right(css_select_state *state); css_error compose_margin_right(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -418,7 +418,7 @@ css_error cascade_margin_bottom(uint32_t opv, css_style *style, css_select_state *state); css_error set_margin_bottom_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_margin_bottom(css_computed_style *style); +css_error initial_margin_bottom(css_select_state *state); css_error compose_margin_bottom(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -426,7 +426,7 @@ css_error cascade_margin_left(uint32_t opv, css_style *style, css_select_state *state); css_error set_margin_left_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_margin_left(css_computed_style *style); +css_error initial_margin_left(css_select_state *state); css_error compose_margin_left(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -434,7 +434,7 @@ css_error cascade_max_height(uint32_t opv, css_style *style, css_select_state *state); css_error set_max_height_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_max_height(css_computed_style *style); +css_error initial_max_height(css_select_state *state); css_error compose_max_height(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -442,7 +442,7 @@ css_error cascade_max_width(uint32_t opv, css_style *style, css_select_state *state); css_error set_max_width_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_max_width(css_computed_style *style); +css_error initial_max_width(css_select_state *state); css_error compose_max_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -450,7 +450,7 @@ css_error cascade_min_height(uint32_t opv, css_style *style, css_select_state *state); css_error set_min_height_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_min_height(css_computed_style *style); +css_error initial_min_height(css_select_state *state); css_error compose_min_height(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -458,7 +458,7 @@ css_error cascade_min_width(uint32_t opv, css_style *style, css_select_state *state); css_error set_min_width_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_min_width(css_computed_style *style); +css_error initial_min_width(css_select_state *state); css_error compose_min_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -466,7 +466,7 @@ css_error cascade_orphans(uint32_t opv, css_style *style, css_select_state *state); css_error set_orphans_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_orphans(css_computed_style *style); +css_error initial_orphans(css_select_state *state); css_error compose_orphans(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -474,7 +474,7 @@ css_error cascade_outline_color(uint32_t opv, css_style *style, css_select_state *state); css_error set_outline_color_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_outline_color(css_computed_style *style); +css_error initial_outline_color(css_select_state *state); css_error compose_outline_color(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -482,7 +482,7 @@ css_error cascade_outline_style(uint32_t opv, css_style *style, css_select_state *state); css_error set_outline_style_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_outline_style(css_computed_style *style); +css_error initial_outline_style(css_select_state *state); css_error compose_outline_style(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -490,7 +490,7 @@ css_error cascade_outline_width(uint32_t opv, css_style *style, css_select_state *state); css_error set_outline_width_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_outline_width(css_computed_style *style); +css_error initial_outline_width(css_select_state *state); css_error compose_outline_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -498,7 +498,7 @@ css_error cascade_overflow(uint32_t opv, css_style *style, css_select_state *state); css_error set_overflow_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_overflow(css_computed_style *style); +css_error initial_overflow(css_select_state *state); css_error compose_overflow(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -506,7 +506,7 @@ css_error cascade_padding_top(uint32_t opv, css_style *style, css_select_state *state); css_error set_padding_top_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_padding_top(css_computed_style *style); +css_error initial_padding_top(css_select_state *state); css_error compose_padding_top(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -514,7 +514,7 @@ css_error cascade_padding_right(uint32_t opv, css_style *style, css_select_state *state); css_error set_padding_right_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_padding_right(css_computed_style *style); +css_error initial_padding_right(css_select_state *state); css_error compose_padding_right(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -522,7 +522,7 @@ css_error cascade_padding_bottom(uint32_t opv, css_style *style, css_select_state *state); css_error set_padding_bottom_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_padding_bottom(css_computed_style *style); +css_error initial_padding_bottom(css_select_state *state); css_error compose_padding_bottom(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -530,7 +530,7 @@ css_error cascade_padding_left(uint32_t opv, css_style *style, css_select_state *state); css_error set_padding_left_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_padding_left(css_computed_style *style); +css_error initial_padding_left(css_select_state *state); css_error compose_padding_left(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -538,7 +538,7 @@ css_error cascade_page_break_after(uint32_t opv, css_style *style, css_select_state *state); css_error set_page_break_after_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_page_break_after(css_computed_style *style); +css_error initial_page_break_after(css_select_state *state); css_error compose_page_break_after(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -546,7 +546,7 @@ css_error cascade_page_break_before(uint32_t opv, css_style *style, css_select_state *state); css_error set_page_break_before_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_page_break_before(css_computed_style *style); +css_error initial_page_break_before(css_select_state *state); css_error compose_page_break_before(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -554,7 +554,7 @@ css_error cascade_page_break_inside(uint32_t opv, css_style *style, css_select_state *state); css_error set_page_break_inside_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_page_break_inside(css_computed_style *style); +css_error initial_page_break_inside(css_select_state *state); css_error compose_page_break_inside(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -562,7 +562,7 @@ css_error cascade_pause_after(uint32_t opv, css_style *style, css_select_state *state); css_error set_pause_after_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_pause_after(css_computed_style *style); +css_error initial_pause_after(css_select_state *state); css_error compose_pause_after(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -570,7 +570,7 @@ css_error cascade_pause_before(uint32_t opv, css_style *style, css_select_state *state); css_error set_pause_before_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_pause_before(css_computed_style *style); +css_error initial_pause_before(css_select_state *state); css_error compose_pause_before(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -578,7 +578,7 @@ css_error cascade_pitch_range(uint32_t opv, css_style *style, css_select_state *state); css_error set_pitch_range_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_pitch_range(css_computed_style *style); +css_error initial_pitch_range(css_select_state *state); css_error compose_pitch_range(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -586,7 +586,7 @@ css_error cascade_pitch(uint32_t opv, css_style *style, css_select_state *state); css_error set_pitch_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_pitch(css_computed_style *style); +css_error initial_pitch(css_select_state *state); css_error compose_pitch(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -594,7 +594,7 @@ css_error cascade_play_during(uint32_t opv, css_style *style, css_select_state *state); css_error set_play_during_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_play_during(css_computed_style *style); +css_error initial_play_during(css_select_state *state); css_error compose_play_during(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -602,7 +602,7 @@ css_error cascade_position(uint32_t opv, css_style *style, css_select_state *state); css_error set_position_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_position(css_computed_style *style); +css_error initial_position(css_select_state *state); css_error compose_position(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -610,7 +610,7 @@ css_error cascade_quotes(uint32_t opv, css_style *style, css_select_state *state); css_error set_quotes_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_quotes(css_computed_style *style); +css_error initial_quotes(css_select_state *state); css_error compose_quotes(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -618,7 +618,7 @@ css_error cascade_richness(uint32_t opv, css_style *style, css_select_state *state); css_error set_richness_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_richness(css_computed_style *style); +css_error initial_richness(css_select_state *state); css_error compose_richness(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -626,7 +626,7 @@ css_error cascade_right(uint32_t opv, css_style *style, css_select_state *state); css_error set_right_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_right(css_computed_style *style); +css_error initial_right(css_select_state *state); css_error compose_right(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -634,7 +634,7 @@ css_error cascade_speak_header(uint32_t opv, css_style *style, css_select_state *state); css_error set_speak_header_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_speak_header(css_computed_style *style); +css_error initial_speak_header(css_select_state *state); css_error compose_speak_header(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -642,7 +642,7 @@ css_error cascade_speak_numeral(uint32_t opv, css_style *style, css_select_state *state); css_error set_speak_numeral_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_speak_numeral(css_computed_style *style); +css_error initial_speak_numeral(css_select_state *state); css_error compose_speak_numeral(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -650,7 +650,7 @@ css_error cascade_speak_punctuation(uint32_t opv, css_style *style, css_select_state *state); css_error set_speak_punctuation_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_speak_punctuation(css_computed_style *style); +css_error initial_speak_punctuation(css_select_state *state); css_error compose_speak_punctuation(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -658,7 +658,7 @@ css_error cascade_speak(uint32_t opv, css_style *style, css_select_state *state); css_error set_speak_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_speak(css_computed_style *style); +css_error initial_speak(css_select_state *state); css_error compose_speak(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -666,7 +666,7 @@ css_error cascade_speech_rate(uint32_t opv, css_style *style, css_select_state *state); css_error set_speech_rate_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_speech_rate(css_computed_style *style); +css_error initial_speech_rate(css_select_state *state); css_error compose_speech_rate(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -674,7 +674,7 @@ css_error cascade_stress(uint32_t opv, css_style *style, css_select_state *state); css_error set_stress_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_stress(css_computed_style *style); +css_error initial_stress(css_select_state *state); css_error compose_stress(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -682,7 +682,7 @@ css_error cascade_table_layout(uint32_t opv, css_style *style, css_select_state *state); css_error set_table_layout_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_table_layout(css_computed_style *style); +css_error initial_table_layout(css_select_state *state); css_error compose_table_layout(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -690,7 +690,7 @@ css_error cascade_text_align(uint32_t opv, css_style *style, css_select_state *state); css_error set_text_align_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_text_align(css_computed_style *style); +css_error initial_text_align(css_select_state *state); css_error compose_text_align(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -698,7 +698,7 @@ css_error cascade_text_decoration(uint32_t opv, css_style *style, css_select_state *state); css_error set_text_decoration_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_text_decoration(css_computed_style *style); +css_error initial_text_decoration(css_select_state *state); css_error compose_text_decoration(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -706,7 +706,7 @@ css_error cascade_text_indent(uint32_t opv, css_style *style, css_select_state *state); css_error set_text_indent_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_text_indent(css_computed_style *style); +css_error initial_text_indent(css_select_state *state); css_error compose_text_indent(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -714,7 +714,7 @@ css_error cascade_text_transform(uint32_t opv, css_style *style, css_select_state *state); css_error set_text_transform_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_text_transform(css_computed_style *style); +css_error initial_text_transform(css_select_state *state); css_error compose_text_transform(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -722,7 +722,7 @@ css_error cascade_top(uint32_t opv, css_style *style, css_select_state *state); css_error set_top_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_top(css_computed_style *style); +css_error initial_top(css_select_state *state); css_error compose_top(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -730,7 +730,7 @@ css_error cascade_unicode_bidi(uint32_t opv, css_style *style, css_select_state *state); css_error set_unicode_bidi_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_unicode_bidi(css_computed_style *style); +css_error initial_unicode_bidi(css_select_state *state); css_error compose_unicode_bidi(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -738,7 +738,7 @@ css_error cascade_vertical_align(uint32_t opv, css_style *style, css_select_state *state); css_error set_vertical_align_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_vertical_align(css_computed_style *style); +css_error initial_vertical_align(css_select_state *state); css_error compose_vertical_align(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -746,7 +746,7 @@ css_error cascade_visibility(uint32_t opv, css_style *style, css_select_state *state); css_error set_visibility_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_visibility(css_computed_style *style); +css_error initial_visibility(css_select_state *state); css_error compose_visibility(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -754,7 +754,7 @@ css_error cascade_voice_family(uint32_t opv, css_style *style, css_select_state *state); css_error set_voice_family_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_voice_family(css_computed_style *style); +css_error initial_voice_family(css_select_state *state); css_error compose_voice_family(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -762,7 +762,7 @@ css_error cascade_volume(uint32_t opv, css_style *style, css_select_state *state); css_error set_volume_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_volume(css_computed_style *style); +css_error initial_volume(css_select_state *state); css_error compose_volume(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -770,7 +770,7 @@ css_error cascade_white_space(uint32_t opv, css_style *style, css_select_state *state); css_error set_white_space_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_white_space(css_computed_style *style); +css_error initial_white_space(css_select_state *state); css_error compose_white_space(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -778,7 +778,7 @@ css_error cascade_widows(uint32_t opv, css_style *style, css_select_state *state); css_error set_widows_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_widows(css_computed_style *style); +css_error initial_widows(css_select_state *state); css_error compose_widows(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -786,7 +786,7 @@ css_error cascade_width(uint32_t opv, css_style *style, css_select_state *state); css_error set_width_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_width(css_computed_style *style); +css_error initial_width(css_select_state *state); css_error compose_width(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -794,7 +794,7 @@ css_error cascade_word_spacing(uint32_t opv, css_style *style, css_select_state *state); css_error set_word_spacing_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_word_spacing(css_computed_style *style); +css_error initial_word_spacing(css_select_state *state); css_error compose_word_spacing(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); @@ -802,7 +802,7 @@ css_error cascade_z_index(uint32_t opv, css_style *style, css_select_state *state); css_error set_z_index_from_hint(const css_hint *hint, css_computed_style *style); -css_error initial_z_index(css_computed_style *style); +css_error initial_z_index(css_select_state *state); css_error compose_z_index(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); diff --git a/src/select/propset.h b/src/select/propset.h index 27860f0..743297b 100644 --- a/src/select/propset.h +++ b/src/select/propset.h @@ -242,8 +242,8 @@ static inline css_error set_cursor( #undef CURSOR_INDEX #define QUOTES_INDEX 4 -#define QUOTES_SHIFT 1 -#define QUOTES_MASK 0x6 +#define QUOTES_SHIFT 2 +#define QUOTES_MASK 0x4 static inline css_error set_quotes( css_computed_style *style, uint8_t type, lwc_string **quotes) @@ -254,9 +254,9 @@ static inline css_error set_quotes( bits = &style->uncommon->bits[QUOTES_INDEX]; - /* 2bits: type */ + /* 1bit: type */ *bits = (*bits & ~QUOTES_MASK) | - ((type & 0x3) << QUOTES_SHIFT); + ((type & 0x1) << QUOTES_SHIFT); style->uncommon->quotes = quotes; diff --git a/src/select/select.c b/src/select/select.c index bc674b8..b3fde4e 100644 --- a/src/select/select.c +++ b/src/select/select.c @@ -425,22 +425,22 @@ css_error set_hint_or_initial(css_select_state *state, uint32_t i, void *parent) * property. */ if (prop_dispatch[i].group == GROUP_NORMAL) { - error = prop_dispatch[i].initial(state->result); + error = prop_dispatch[i].initial(state); if (error != CSS_OK) return error; } else if (prop_dispatch[i].group == GROUP_UNCOMMON && state->result->uncommon != NULL) { - error = prop_dispatch[i].initial(state->result); + error = prop_dispatch[i].initial(state); if (error != CSS_OK) return error; } else if (prop_dispatch[i].group == GROUP_PAGE && state->result->page != NULL) { - error = prop_dispatch[i].initial(state->result); + error = prop_dispatch[i].initial(state); if (error != CSS_OK) return error; } else if (prop_dispatch[i].group == GROUP_AURAL && state->result->aural != NULL) { - error = prop_dispatch[i].initial(state->result); + error = prop_dispatch[i].initial(state); if (error != CSS_OK) return error; } diff --git a/test/data/select/tests1.dat b/test/data/select/tests1.dat index 3f593ff..09f9ef0 100644 --- a/test/data/select/tests1.dat +++ b/test/data/select/tests1.dat @@ -60,7 +60,7 @@ padding-right: 0px padding-bottom: 0px padding-left: 0px position: static -quotes: default +quotes: none right: auto table-layout: auto text-decoration: none @@ -135,7 +135,7 @@ padding-right: 0px padding-bottom: 0px padding-left: 0px position: static -quotes: default +quotes: none right: auto table-layout: auto text-decoration: none @@ -210,7 +210,7 @@ padding-right: 0px padding-bottom: 0px padding-left: 0px position: static -quotes: default +quotes: none right: auto table-layout: auto text-decoration: none @@ -262,7 +262,7 @@ direction: ltr display: block empty-cells: show float: none -font-family: default +font-family: sans-serif font-size: medium font-style: normal font-variant: normal @@ -291,7 +291,7 @@ padding-right: 0px padding-bottom: 0px padding-left: 0px position: static -quotes: default +quotes: none right: auto table-layout: auto text-align: default @@ -347,7 +347,7 @@ direction: ltr display: inline empty-cells: show float: none -font-family: default +font-family: sans-serif font-size: medium font-style: normal font-variant: normal @@ -376,7 +376,7 @@ padding-right: 0px padding-bottom: 0px padding-left: 0px position: static -quotes: default +quotes: none right: auto table-layout: auto text-align: default @@ -447,7 +447,7 @@ padding-right: 0px padding-bottom: 0px padding-left: 0px position: static -quotes: default +quotes: none right: auto table-layout: auto text-decoration: none diff --git a/test/dump_computed.h b/test/dump_computed.h index 56a818c..a9e2d88 100644 --- a/test/dump_computed.h +++ b/test/dump_computed.h @@ -1149,9 +1149,6 @@ static void dump_computed_style(const css_computed_style *style, char *buf, case CSS_FONT_FAMILY_MONOSPACE: wrote = snprintf(ptr, *len, " monospace\n"); break; - case CSS_FONT_FAMILY_DEFAULT: - wrote = snprintf(ptr, *len, " default\n"); - break; } ptr += wrote; *len -= wrote; @@ -1902,9 +1899,6 @@ static void dump_computed_style(const css_computed_style *style, char *buf, case CSS_QUOTES_NONE: wrote = snprintf(ptr, *len, "quotes: none\n"); break; - case CSS_QUOTES_DEFAULT: - wrote = snprintf(ptr, *len, "quotes: default\n"); - break; } } ptr += wrote; diff --git a/test/select-auto.c b/test/select-auto.c index e884a18..fed6204 100644 --- a/test/select-auto.c +++ b/test/select-auto.c @@ -114,6 +114,8 @@ static css_error node_is_lang(void *pw, void *node, lwc_string *lang, bool *match); static css_error node_presentational_hint(void *pw, void *node, uint32_t property, css_hint *hint); +static css_error ua_default_for_property(void *pw, uint32_t property, + css_hint *hint); static css_select_handler select_handler = { node_name, @@ -135,7 +137,8 @@ static css_select_handler select_handler = { node_is_active, node_is_focus, node_is_lang, - node_presentational_hint + node_presentational_hint, + ua_default_for_property }; static void *myrealloc(void *data, size_t len, void *pw) @@ -1082,3 +1085,28 @@ css_error node_presentational_hint(void *pw, void *node, return CSS_PROPERTY_NOT_SET; } +css_error ua_default_for_property(void *pw, uint32_t property, css_hint *hint) +{ + UNUSED(pw); + + if (property == CSS_PROP_COLOR) { + hint->data.color = 0x00000000; + hint->status = CSS_COLOR_COLOR; + } else if (property == CSS_PROP_FONT_FAMILY) { + hint->data.strings = NULL; + hint->status = CSS_FONT_FAMILY_SANS_SERIF; + } else if (property == CSS_PROP_QUOTES) { + /* Not exactly useful :) */ + hint->data.strings = NULL; + hint->status = CSS_QUOTES_NONE; + } else if (property == CSS_PROP_VOICE_FAMILY) { + /** \todo Fix this when we have voice-family done */ + hint->data.strings = NULL; + hint->status = 0; + } else { + return CSS_INVALID; + } + + return CSS_OK; +} + |