From 298dd8dd93abfc33c3ab3209f00d78e93fbd041c Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sun, 12 May 2019 16:39:08 +0100 Subject: Computed styles: Remove last traces of extension blocks. --- src/select/autogenerated_computed.h | 78 +++--- src/select/autogenerated_propget.h | 508 ++++++++++++++++++------------------ src/select/autogenerated_propset.h | 508 ++++++++++++++++++------------------ src/select/computed.c | 17 +- src/select/dispatch.c | 124 --------- src/select/dispatch.h | 11 - src/select/select.c | 23 -- src/select/select_generator.py | 1 - 8 files changed, 548 insertions(+), 722 deletions(-) diff --git a/src/select/autogenerated_computed.h b/src/select/autogenerated_computed.h index fab3ae2..4d21fad 100644 --- a/src/select/autogenerated_computed.h +++ b/src/select/autogenerated_computed.h @@ -146,59 +146,60 @@ struct css_computed_style_i { * * Bit allocations: * - * 0 bbbbbbbboooooooorrrrrrrruuuuuuuu - * border_top_width; border_left_width; border_bottom_width; outline_width + * 0 ccccccccoooooooobbbbbbbbrrrrrrrr + * column_rule_width; outline_width; border_left_width; border_bottom_width * - * 1 fffffffffbbbbbbbbccccccccttttttt - * font_size; border_right_width; column_rule_width; top + * 1 vvvvvvvvvbbbbbbbboooooooolllllll + * vertical_align; border_top_width; border_right_width; letter_spacing * * 2 ccccccccccccccccccccccccccpppppp - * clip; padding_right + * clip; padding_top * - * 3 mmmmmmmfffffffwwwwwwwttttttccccc - * min_height; flex_basis; word_spacing; text_indent; cursor + * 3 mmmmmmmaaaaaaarrrrrrrttttttddddd + * max_width; margin_bottom; margin_left; text_indent; display * - * 4 lllllllhhhhhhhwwwwwwwmmmmmmmbbbb - * line_height; height; width; margin_bottom; break_inside + * 4 wwwwwwwfffffffcccccccllllllloooo + * word_spacing; flex_basis; column_gap; left; font_weight * - * 5 cccccccmmmmmmmaaaaaaalllllllbbbb - * column_gap; margin_top; max_height; left; border_top_style + * 5 wwwwwwwhhhhhhhlllllllcccccccoooo + * width; height; line_height; column_width; outline_style * - * 6 mmmmmmmcccccccbbbbbbbaaaaaaarrrr - * max_width; column_width; bottom; margin_left; break_after + * 6 tttttttmmmmmmmiiiiiiiaaaaaaabbbb + * top; max_height; min_width; margin_right; border_top_style * - * 7 mmmmmmmrrrrrrrlllllllaaaaaaabbbb - * min_width; right; letter_spacing; margin_right; border_right_style + * 7 rrrrrrrbbbbbbbmmmmmmmaaaaaaacccc + * right; bottom; min_height; margin_top; column_rule_style * - * 8 ppppppaaaaaaddddddiiiiitttttllll - * padding_bottom; padding_top; padding_left; display; text_decoration; - * list_style_type + * 8 ppppppaaaaaaddddddtttttcccccbbbb + * padding_left; padding_right; padding_bottom; text_decoration; cursor; + * border_right_style * - * 9 fffpppwwwcccaaajjjlllgggiiieeebb - * font_family; position; white_space; clear; align_items; justify_content; - * flex_direction; page_break_after; align_self; page_break_before; box_sizing + * 9 aaafffpppllliiiooovvvttteeeggguu + * align_items; font_family; page_break_before; align_self; align_content; + * overflow_x; overflow_y; text_transform; flex_direction; page_break_after; + * unicode_bidi * - * 10 ooobbbtttvvviirrddffaaeewwzzccpp - * overflow_x; background_repeat; text_transform; overflow_y; visibility; - * border_right_color; border_collapse; float; background_attachment; - * border_bottom_color; writing_mode; z_index; column_count; border_top_color + * 10 jjjpppcccwwwbbddeeffooaallggkkrr + * justify_content; position; clear; white_space; box_sizing; direction; + * empty_cells; flex_wrap; column_rule_color; background_attachment; + * column_span; page_break_inside; background_color; border_left_color * - * 11 cceeddooffuuttllaabbiinnUUvvkkpp - * column_rule_color; empty_cells; direction; column_span; font_style; - * outline_color; table_layout; column_fill; caption_side; border_left_color; - * list_style_position; content; unicode_bidi; font_variant; background_color; - * page_break_inside + * 11 ffbbooccnnllwwrrvvuummddaattzzee + * font_style; border_bottom_color; border_top_color; caption_side; + * font_variant; column_count; writing_mode; border_collapse; visibility; + * outline_color; column_fill; border_right_color; float; table_layout; + * z_index; content * - * 12 bbbbbbbbbbbooooooooooovvvvvvvvvr - * background_position; border_spacing; vertical_align; order + * 12 bbbbbbbbbbbaaaaaaaaaaafffffffffc + * border_spacing; background_position; font_size; color * - * 13 ffffoooobbbbccccrrrrddddttttaaaq - * font_weight; outline_style; border_left_style; column_rule_style; - * break_before; border_bottom_style; text_align; align_content; quotes + * 13 bbbbrrrrllllttttooooddddeeeeaaai + * break_after; break_before; list_style_type; text_align; border_left_style; + * border_bottom_style; break_inside; background_repeat; list_style_image * - * 14 fflbceworuip.................... - * flex_wrap; flex_grow; background_image; counter_reset; flex_shrink; widows; - * opacity; color; counter_increment; list_style_image; orphans + * 14 llcbqopwfrue.................... + * list_style_position; counter_increment; background_image; quotes; order; + * opacity; widows; flex_grow; orphans; counter_reset; flex_shrink */ uint32_t bits[15]; @@ -262,7 +263,6 @@ struct css_computed_style_i { css_fixed word_spacing; int32_t z_index; - void *aural; }; struct css_computed_style { diff --git a/src/select/autogenerated_propget.h b/src/select/autogenerated_propget.h index ff67f7c..f1b6092 100644 --- a/src/select/autogenerated_propget.h +++ b/src/select/autogenerated_propget.h @@ -6,9 +6,9 @@ */ -#define ALIGN_CONTENT_INDEX 13 -#define ALIGN_CONTENT_SHIFT 1 -#define ALIGN_CONTENT_MASK 0xe +#define ALIGN_CONTENT_INDEX 9 +#define ALIGN_CONTENT_SHIFT 17 +#define ALIGN_CONTENT_MASK 0xe0000 static inline uint8_t get_align_content(const css_computed_style *style) { uint32_t bits = style->i.bits[ALIGN_CONTENT_INDEX]; @@ -24,8 +24,8 @@ static inline uint8_t get_align_content(const css_computed_style *style) #undef ALIGN_CONTENT_MASK #define ALIGN_ITEMS_INDEX 9 -#define ALIGN_ITEMS_SHIFT 17 -#define ALIGN_ITEMS_MASK 0xe0000 +#define ALIGN_ITEMS_SHIFT 29 +#define ALIGN_ITEMS_MASK 0xe0000000 static inline uint8_t get_align_items(const css_computed_style *style) { uint32_t bits = style->i.bits[ALIGN_ITEMS_INDEX]; @@ -41,8 +41,8 @@ static inline uint8_t get_align_items(const css_computed_style *style) #undef ALIGN_ITEMS_MASK #define ALIGN_SELF_INDEX 9 -#define ALIGN_SELF_SHIFT 5 -#define ALIGN_SELF_MASK 0xe0 +#define ALIGN_SELF_SHIFT 20 +#define ALIGN_SELF_MASK 0x700000 static inline uint8_t get_align_self(const css_computed_style *style) { uint32_t bits = style->i.bits[ALIGN_SELF_INDEX]; @@ -58,8 +58,8 @@ static inline uint8_t get_align_self(const css_computed_style *style) #undef ALIGN_SELF_MASK #define BACKGROUND_ATTACHMENT_INDEX 10 -#define BACKGROUND_ATTACHMENT_SHIFT 10 -#define BACKGROUND_ATTACHMENT_MASK 0xc00 +#define BACKGROUND_ATTACHMENT_SHIFT 8 +#define BACKGROUND_ATTACHMENT_MASK 0x300 static inline uint8_t get_background_attachment(const css_computed_style *style) { uint32_t bits = style->i.bits[BACKGROUND_ATTACHMENT_INDEX]; @@ -74,7 +74,7 @@ static inline uint8_t get_background_attachment(const css_computed_style *style) #undef BACKGROUND_ATTACHMENT_SHIFT #undef BACKGROUND_ATTACHMENT_MASK -#define BACKGROUND_COLOR_INDEX 11 +#define BACKGROUND_COLOR_INDEX 10 #define BACKGROUND_COLOR_SHIFT 2 #define BACKGROUND_COLOR_MASK 0xc static inline uint8_t get_background_color(const css_computed_style *style, @@ -113,8 +113,8 @@ static inline uint8_t get_background_image(const css_computed_style *style, #undef BACKGROUND_IMAGE_MASK #define BACKGROUND_POSITION_INDEX 12 -#define BACKGROUND_POSITION_SHIFT 21 -#define BACKGROUND_POSITION_MASK 0xffe00000 +#define BACKGROUND_POSITION_SHIFT 10 +#define BACKGROUND_POSITION_MASK 0x1ffc00 static inline uint8_t get_background_position(const css_computed_style *style, css_fixed *length_a, css_unit *unit_a, css_fixed *length_b, css_unit *unit_b) @@ -137,9 +137,9 @@ static inline uint8_t get_background_position(const css_computed_style *style, #undef BACKGROUND_POSITION_SHIFT #undef BACKGROUND_POSITION_MASK -#define BACKGROUND_REPEAT_INDEX 10 -#define BACKGROUND_REPEAT_SHIFT 26 -#define BACKGROUND_REPEAT_MASK 0x1c000000 +#define BACKGROUND_REPEAT_INDEX 13 +#define BACKGROUND_REPEAT_SHIFT 1 +#define BACKGROUND_REPEAT_MASK 0xe static inline uint8_t get_background_repeat(const css_computed_style *style) { uint32_t bits = style->i.bits[BACKGROUND_REPEAT_INDEX]; @@ -154,9 +154,9 @@ static inline uint8_t get_background_repeat(const css_computed_style *style) #undef BACKGROUND_REPEAT_SHIFT #undef BACKGROUND_REPEAT_MASK -#define BORDER_BOTTOM_COLOR_INDEX 10 -#define BORDER_BOTTOM_COLOR_SHIFT 8 -#define BORDER_BOTTOM_COLOR_MASK 0x300 +#define BORDER_BOTTOM_COLOR_INDEX 11 +#define BORDER_BOTTOM_COLOR_SHIFT 28 +#define BORDER_BOTTOM_COLOR_MASK 0x30000000 static inline uint8_t get_border_bottom_color(const css_computed_style *style, css_color *color) { @@ -191,8 +191,8 @@ static inline uint8_t get_border_bottom_style(const css_computed_style *style) #undef BORDER_BOTTOM_STYLE_MASK #define BORDER_BOTTOM_WIDTH_INDEX 0 -#define BORDER_BOTTOM_WIDTH_SHIFT 8 -#define BORDER_BOTTOM_WIDTH_MASK 0xff00 +#define BORDER_BOTTOM_WIDTH_SHIFT 0 +#define BORDER_BOTTOM_WIDTH_MASK 0xff static inline uint8_t get_border_bottom_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -212,9 +212,9 @@ static inline uint8_t get_border_bottom_width(const css_computed_style *style, #undef BORDER_BOTTOM_WIDTH_SHIFT #undef BORDER_BOTTOM_WIDTH_MASK -#define BORDER_COLLAPSE_INDEX 10 -#define BORDER_COLLAPSE_SHIFT 14 -#define BORDER_COLLAPSE_MASK 0xc000 +#define BORDER_COLLAPSE_INDEX 11 +#define BORDER_COLLAPSE_SHIFT 16 +#define BORDER_COLLAPSE_MASK 0x30000 static inline uint8_t get_border_collapse(const css_computed_style *style) { uint32_t bits = style->i.bits[BORDER_COLLAPSE_INDEX]; @@ -229,9 +229,9 @@ static inline uint8_t get_border_collapse(const css_computed_style *style) #undef BORDER_COLLAPSE_SHIFT #undef BORDER_COLLAPSE_MASK -#define BORDER_LEFT_COLOR_INDEX 11 -#define BORDER_LEFT_COLOR_SHIFT 12 -#define BORDER_LEFT_COLOR_MASK 0x3000 +#define BORDER_LEFT_COLOR_INDEX 10 +#define BORDER_LEFT_COLOR_SHIFT 0 +#define BORDER_LEFT_COLOR_MASK 0x3 static inline uint8_t get_border_left_color(const css_computed_style *style, css_color *color) { @@ -249,8 +249,8 @@ static inline uint8_t get_border_left_color(const css_computed_style *style, #undef BORDER_LEFT_COLOR_MASK #define BORDER_LEFT_STYLE_INDEX 13 -#define BORDER_LEFT_STYLE_SHIFT 20 -#define BORDER_LEFT_STYLE_MASK 0xf00000 +#define BORDER_LEFT_STYLE_SHIFT 12 +#define BORDER_LEFT_STYLE_MASK 0xf000 static inline uint8_t get_border_left_style(const css_computed_style *style) { uint32_t bits = style->i.bits[BORDER_LEFT_STYLE_INDEX]; @@ -266,8 +266,8 @@ static inline uint8_t get_border_left_style(const css_computed_style *style) #undef BORDER_LEFT_STYLE_MASK #define BORDER_LEFT_WIDTH_INDEX 0 -#define BORDER_LEFT_WIDTH_SHIFT 16 -#define BORDER_LEFT_WIDTH_MASK 0xff0000 +#define BORDER_LEFT_WIDTH_SHIFT 8 +#define BORDER_LEFT_WIDTH_MASK 0xff00 static inline uint8_t get_border_left_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -287,9 +287,9 @@ static inline uint8_t get_border_left_width(const css_computed_style *style, #undef BORDER_LEFT_WIDTH_SHIFT #undef BORDER_LEFT_WIDTH_MASK -#define BORDER_RIGHT_COLOR_INDEX 10 -#define BORDER_RIGHT_COLOR_SHIFT 16 -#define BORDER_RIGHT_COLOR_MASK 0x30000 +#define BORDER_RIGHT_COLOR_INDEX 11 +#define BORDER_RIGHT_COLOR_SHIFT 8 +#define BORDER_RIGHT_COLOR_MASK 0x300 static inline uint8_t get_border_right_color(const css_computed_style *style, css_color *color) { @@ -306,7 +306,7 @@ static inline uint8_t get_border_right_color(const css_computed_style *style, #undef BORDER_RIGHT_COLOR_SHIFT #undef BORDER_RIGHT_COLOR_MASK -#define BORDER_RIGHT_STYLE_INDEX 7 +#define BORDER_RIGHT_STYLE_INDEX 8 #define BORDER_RIGHT_STYLE_SHIFT 0 #define BORDER_RIGHT_STYLE_MASK 0xf static inline uint8_t get_border_right_style(const css_computed_style *style) @@ -324,8 +324,8 @@ static inline uint8_t get_border_right_style(const css_computed_style *style) #undef BORDER_RIGHT_STYLE_MASK #define BORDER_RIGHT_WIDTH_INDEX 1 -#define BORDER_RIGHT_WIDTH_SHIFT 15 -#define BORDER_RIGHT_WIDTH_MASK 0x7f8000 +#define BORDER_RIGHT_WIDTH_SHIFT 7 +#define BORDER_RIGHT_WIDTH_MASK 0x7f80 static inline uint8_t get_border_right_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -346,8 +346,8 @@ static inline uint8_t get_border_right_width(const css_computed_style *style, #undef BORDER_RIGHT_WIDTH_MASK #define BORDER_SPACING_INDEX 12 -#define BORDER_SPACING_SHIFT 10 -#define BORDER_SPACING_MASK 0x1ffc00 +#define BORDER_SPACING_SHIFT 21 +#define BORDER_SPACING_MASK 0xffe00000 static inline uint8_t get_border_spacing(const css_computed_style *style, css_fixed *length_a, css_unit *unit_a, css_fixed *length_b, css_unit *unit_b) @@ -370,9 +370,9 @@ static inline uint8_t get_border_spacing(const css_computed_style *style, #undef BORDER_SPACING_SHIFT #undef BORDER_SPACING_MASK -#define BORDER_TOP_COLOR_INDEX 10 -#define BORDER_TOP_COLOR_SHIFT 0 -#define BORDER_TOP_COLOR_MASK 0x3 +#define BORDER_TOP_COLOR_INDEX 11 +#define BORDER_TOP_COLOR_SHIFT 26 +#define BORDER_TOP_COLOR_MASK 0xc000000 static inline uint8_t get_border_top_color(const css_computed_style *style, css_color *color) { @@ -389,7 +389,7 @@ static inline uint8_t get_border_top_color(const css_computed_style *style, #undef BORDER_TOP_COLOR_SHIFT #undef BORDER_TOP_COLOR_MASK -#define BORDER_TOP_STYLE_INDEX 5 +#define BORDER_TOP_STYLE_INDEX 6 #define BORDER_TOP_STYLE_SHIFT 0 #define BORDER_TOP_STYLE_MASK 0xf static inline uint8_t get_border_top_style(const css_computed_style *style) @@ -406,9 +406,9 @@ static inline uint8_t get_border_top_style(const css_computed_style *style) #undef BORDER_TOP_STYLE_SHIFT #undef BORDER_TOP_STYLE_MASK -#define BORDER_TOP_WIDTH_INDEX 0 -#define BORDER_TOP_WIDTH_SHIFT 24 -#define BORDER_TOP_WIDTH_MASK 0xff000000 +#define BORDER_TOP_WIDTH_INDEX 1 +#define BORDER_TOP_WIDTH_SHIFT 15 +#define BORDER_TOP_WIDTH_MASK 0x7f8000 static inline uint8_t get_border_top_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -428,9 +428,9 @@ static inline uint8_t get_border_top_width(const css_computed_style *style, #undef BORDER_TOP_WIDTH_SHIFT #undef BORDER_TOP_WIDTH_MASK -#define BOTTOM_INDEX 6 -#define BOTTOM_SHIFT 11 -#define BOTTOM_MASK 0x3f800 +#define BOTTOM_INDEX 7 +#define BOTTOM_SHIFT 18 +#define BOTTOM_MASK 0x1fc0000 static inline uint8_t get_bottom( const css_computed_style *style, css_fixed *length, css_unit *unit) @@ -461,9 +461,9 @@ static inline uint8_t get_bottom_bits( #undef BOTTOM_SHIFT #undef BOTTOM_MASK -#define BOX_SIZING_INDEX 9 -#define BOX_SIZING_SHIFT 0 -#define BOX_SIZING_MASK 0x3 +#define BOX_SIZING_INDEX 10 +#define BOX_SIZING_SHIFT 18 +#define BOX_SIZING_MASK 0xc0000 static inline uint8_t get_box_sizing(const css_computed_style *style) { uint32_t bits = style->i.bits[BOX_SIZING_INDEX]; @@ -478,9 +478,9 @@ static inline uint8_t get_box_sizing(const css_computed_style *style) #undef BOX_SIZING_SHIFT #undef BOX_SIZING_MASK -#define BREAK_AFTER_INDEX 6 -#define BREAK_AFTER_SHIFT 0 -#define BREAK_AFTER_MASK 0xf +#define BREAK_AFTER_INDEX 13 +#define BREAK_AFTER_SHIFT 28 +#define BREAK_AFTER_MASK 0xf0000000 static inline uint8_t get_break_after(const css_computed_style *style) { uint32_t bits = style->i.bits[BREAK_AFTER_INDEX]; @@ -496,8 +496,8 @@ static inline uint8_t get_break_after(const css_computed_style *style) #undef BREAK_AFTER_MASK #define BREAK_BEFORE_INDEX 13 -#define BREAK_BEFORE_SHIFT 12 -#define BREAK_BEFORE_MASK 0xf000 +#define BREAK_BEFORE_SHIFT 24 +#define BREAK_BEFORE_MASK 0xf000000 static inline uint8_t get_break_before(const css_computed_style *style) { uint32_t bits = style->i.bits[BREAK_BEFORE_INDEX]; @@ -512,9 +512,9 @@ static inline uint8_t get_break_before(const css_computed_style *style) #undef BREAK_BEFORE_SHIFT #undef BREAK_BEFORE_MASK -#define BREAK_INSIDE_INDEX 4 -#define BREAK_INSIDE_SHIFT 0 -#define BREAK_INSIDE_MASK 0xf +#define BREAK_INSIDE_INDEX 13 +#define BREAK_INSIDE_SHIFT 4 +#define BREAK_INSIDE_MASK 0xf0 static inline uint8_t get_break_inside(const css_computed_style *style) { uint32_t bits = style->i.bits[BREAK_INSIDE_INDEX]; @@ -530,8 +530,8 @@ static inline uint8_t get_break_inside(const css_computed_style *style) #undef BREAK_INSIDE_MASK #define CAPTION_SIDE_INDEX 11 -#define CAPTION_SIDE_SHIFT 14 -#define CAPTION_SIDE_MASK 0xc000 +#define CAPTION_SIDE_SHIFT 24 +#define CAPTION_SIDE_MASK 0x3000000 static inline uint8_t get_caption_side(const css_computed_style *style) { uint32_t bits = style->i.bits[CAPTION_SIDE_INDEX]; @@ -546,9 +546,9 @@ static inline uint8_t get_caption_side(const css_computed_style *style) #undef CAPTION_SIDE_SHIFT #undef CAPTION_SIDE_MASK -#define CLEAR_INDEX 9 -#define CLEAR_SHIFT 20 -#define CLEAR_MASK 0x700000 +#define CLEAR_INDEX 10 +#define CLEAR_SHIFT 23 +#define CLEAR_MASK 0x3800000 static inline uint8_t get_clear(const css_computed_style *style) { uint32_t bits = style->i.bits[CLEAR_INDEX]; @@ -605,9 +605,9 @@ static inline uint8_t get_clip( #undef CLIP_SHIFT #undef CLIP_MASK -#define COLOR_INDEX 14 -#define COLOR_SHIFT 23 -#define COLOR_MASK 0x800000 +#define COLOR_INDEX 12 +#define COLOR_SHIFT 0 +#define COLOR_MASK 0x1 static inline uint8_t get_color(const css_computed_style *style, css_color *color) { @@ -624,9 +624,9 @@ static inline uint8_t get_color(const css_computed_style *style, css_color #undef COLOR_SHIFT #undef COLOR_MASK -#define COLUMN_COUNT_INDEX 10 -#define COLUMN_COUNT_SHIFT 2 -#define COLUMN_COUNT_MASK 0xc +#define COLUMN_COUNT_INDEX 11 +#define COLUMN_COUNT_SHIFT 20 +#define COLUMN_COUNT_MASK 0x300000 static inline uint8_t get_column_count(const css_computed_style *style, int32_t *integer) { @@ -644,8 +644,8 @@ static inline uint8_t get_column_count(const css_computed_style *style, int32_t #undef COLUMN_COUNT_MASK #define COLUMN_FILL_INDEX 11 -#define COLUMN_FILL_SHIFT 16 -#define COLUMN_FILL_MASK 0x30000 +#define COLUMN_FILL_SHIFT 10 +#define COLUMN_FILL_MASK 0xc00 static inline uint8_t get_column_fill(const css_computed_style *style) { uint32_t bits = style->i.bits[COLUMN_FILL_INDEX]; @@ -660,9 +660,9 @@ static inline uint8_t get_column_fill(const css_computed_style *style) #undef COLUMN_FILL_SHIFT #undef COLUMN_FILL_MASK -#define COLUMN_GAP_INDEX 5 -#define COLUMN_GAP_SHIFT 25 -#define COLUMN_GAP_MASK 0xfe000000 +#define COLUMN_GAP_INDEX 4 +#define COLUMN_GAP_SHIFT 11 +#define COLUMN_GAP_MASK 0x3f800 static inline uint8_t get_column_gap(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -682,9 +682,9 @@ static inline uint8_t get_column_gap(const css_computed_style *style, css_fixed #undef COLUMN_GAP_SHIFT #undef COLUMN_GAP_MASK -#define COLUMN_RULE_COLOR_INDEX 11 -#define COLUMN_RULE_COLOR_SHIFT 30 -#define COLUMN_RULE_COLOR_MASK 0xc0000000 +#define COLUMN_RULE_COLOR_INDEX 10 +#define COLUMN_RULE_COLOR_SHIFT 10 +#define COLUMN_RULE_COLOR_MASK 0xc00 static inline uint8_t get_column_rule_color(const css_computed_style *style, css_color *color) { @@ -701,9 +701,9 @@ static inline uint8_t get_column_rule_color(const css_computed_style *style, #undef COLUMN_RULE_COLOR_SHIFT #undef COLUMN_RULE_COLOR_MASK -#define COLUMN_RULE_STYLE_INDEX 13 -#define COLUMN_RULE_STYLE_SHIFT 16 -#define COLUMN_RULE_STYLE_MASK 0xf0000 +#define COLUMN_RULE_STYLE_INDEX 7 +#define COLUMN_RULE_STYLE_SHIFT 0 +#define COLUMN_RULE_STYLE_MASK 0xf static inline uint8_t get_column_rule_style(const css_computed_style *style) { uint32_t bits = style->i.bits[COLUMN_RULE_STYLE_INDEX]; @@ -718,9 +718,9 @@ static inline uint8_t get_column_rule_style(const css_computed_style *style) #undef COLUMN_RULE_STYLE_SHIFT #undef COLUMN_RULE_STYLE_MASK -#define COLUMN_RULE_WIDTH_INDEX 1 -#define COLUMN_RULE_WIDTH_SHIFT 7 -#define COLUMN_RULE_WIDTH_MASK 0x7f80 +#define COLUMN_RULE_WIDTH_INDEX 0 +#define COLUMN_RULE_WIDTH_SHIFT 24 +#define COLUMN_RULE_WIDTH_MASK 0xff000000 static inline uint8_t get_column_rule_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -740,9 +740,9 @@ static inline uint8_t get_column_rule_width(const css_computed_style *style, #undef COLUMN_RULE_WIDTH_SHIFT #undef COLUMN_RULE_WIDTH_MASK -#define COLUMN_SPAN_INDEX 11 -#define COLUMN_SPAN_SHIFT 24 -#define COLUMN_SPAN_MASK 0x3000000 +#define COLUMN_SPAN_INDEX 10 +#define COLUMN_SPAN_SHIFT 6 +#define COLUMN_SPAN_MASK 0xc0 static inline uint8_t get_column_span(const css_computed_style *style) { uint32_t bits = style->i.bits[COLUMN_SPAN_INDEX]; @@ -757,9 +757,9 @@ static inline uint8_t get_column_span(const css_computed_style *style) #undef COLUMN_SPAN_SHIFT #undef COLUMN_SPAN_MASK -#define COLUMN_WIDTH_INDEX 6 -#define COLUMN_WIDTH_SHIFT 18 -#define COLUMN_WIDTH_MASK 0x1fc0000 +#define COLUMN_WIDTH_INDEX 5 +#define COLUMN_WIDTH_SHIFT 4 +#define COLUMN_WIDTH_MASK 0x7f0 static inline uint8_t get_column_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -780,8 +780,8 @@ static inline uint8_t get_column_width(const css_computed_style *style, #undef COLUMN_WIDTH_MASK #define CONTENT_INDEX 11 -#define CONTENT_SHIFT 8 -#define CONTENT_MASK 0x300 +#define CONTENT_SHIFT 0 +#define CONTENT_MASK 0x3 static inline uint8_t get_content(const css_computed_style *style, const css_computed_content_item **content_item) { @@ -801,8 +801,8 @@ static inline uint8_t get_content(const css_computed_style *style, const #undef CONTENT_MASK #define COUNTER_INCREMENT_INDEX 14 -#define COUNTER_INCREMENT_SHIFT 22 -#define COUNTER_INCREMENT_MASK 0x400000 +#define COUNTER_INCREMENT_SHIFT 29 +#define COUNTER_INCREMENT_MASK 0x20000000 static inline uint8_t get_counter_increment(const css_computed_style *style, const css_computed_counter **counter_arr) { @@ -820,8 +820,8 @@ static inline uint8_t get_counter_increment(const css_computed_style *style, #undef COUNTER_INCREMENT_MASK #define COUNTER_RESET_INDEX 14 -#define COUNTER_RESET_SHIFT 27 -#define COUNTER_RESET_MASK 0x8000000 +#define COUNTER_RESET_SHIFT 21 +#define COUNTER_RESET_MASK 0x200000 static inline uint8_t get_counter_reset(const css_computed_style *style, const css_computed_counter **counter_arr) { @@ -838,9 +838,9 @@ static inline uint8_t get_counter_reset(const css_computed_style *style, const #undef COUNTER_RESET_SHIFT #undef COUNTER_RESET_MASK -#define CURSOR_INDEX 3 -#define CURSOR_SHIFT 0 -#define CURSOR_MASK 0x1f +#define CURSOR_INDEX 8 +#define CURSOR_SHIFT 4 +#define CURSOR_MASK 0x1f0 static inline uint8_t get_cursor(const css_computed_style *style, lwc_string ***string_arr) { @@ -857,9 +857,9 @@ static inline uint8_t get_cursor(const css_computed_style *style, lwc_string #undef CURSOR_SHIFT #undef CURSOR_MASK -#define DIRECTION_INDEX 11 -#define DIRECTION_SHIFT 26 -#define DIRECTION_MASK 0xc000000 +#define DIRECTION_INDEX 10 +#define DIRECTION_SHIFT 16 +#define DIRECTION_MASK 0x30000 static inline uint8_t get_direction(const css_computed_style *style) { uint32_t bits = style->i.bits[DIRECTION_INDEX]; @@ -874,9 +874,9 @@ static inline uint8_t get_direction(const css_computed_style *style) #undef DIRECTION_SHIFT #undef DIRECTION_MASK -#define DISPLAY_INDEX 8 -#define DISPLAY_SHIFT 9 -#define DISPLAY_MASK 0x3e00 +#define DISPLAY_INDEX 3 +#define DISPLAY_SHIFT 0 +#define DISPLAY_MASK 0x1f static inline uint8_t get_display(const css_computed_style *style) { uint32_t bits = style->i.bits[DISPLAY_INDEX]; @@ -891,9 +891,9 @@ static inline uint8_t get_display(const css_computed_style *style) #undef DISPLAY_SHIFT #undef DISPLAY_MASK -#define EMPTY_CELLS_INDEX 11 -#define EMPTY_CELLS_SHIFT 28 -#define EMPTY_CELLS_MASK 0x30000000 +#define EMPTY_CELLS_INDEX 10 +#define EMPTY_CELLS_SHIFT 14 +#define EMPTY_CELLS_MASK 0xc000 static inline uint8_t get_empty_cells(const css_computed_style *style) { uint32_t bits = style->i.bits[EMPTY_CELLS_INDEX]; @@ -908,7 +908,7 @@ static inline uint8_t get_empty_cells(const css_computed_style *style) #undef EMPTY_CELLS_SHIFT #undef EMPTY_CELLS_MASK -#define FLEX_BASIS_INDEX 3 +#define FLEX_BASIS_INDEX 4 #define FLEX_BASIS_SHIFT 18 #define FLEX_BASIS_MASK 0x1fc0000 static inline uint8_t get_flex_basis(const css_computed_style *style, css_fixed @@ -931,8 +931,8 @@ static inline uint8_t get_flex_basis(const css_computed_style *style, css_fixed #undef FLEX_BASIS_MASK #define FLEX_DIRECTION_INDEX 9 -#define FLEX_DIRECTION_SHIFT 11 -#define FLEX_DIRECTION_MASK 0x3800 +#define FLEX_DIRECTION_SHIFT 5 +#define FLEX_DIRECTION_MASK 0xe0 static inline uint8_t get_flex_direction(const css_computed_style *style) { uint32_t bits = style->i.bits[FLEX_DIRECTION_INDEX]; @@ -948,8 +948,8 @@ static inline uint8_t get_flex_direction(const css_computed_style *style) #undef FLEX_DIRECTION_MASK #define FLEX_GROW_INDEX 14 -#define FLEX_GROW_SHIFT 29 -#define FLEX_GROW_MASK 0x20000000 +#define FLEX_GROW_SHIFT 23 +#define FLEX_GROW_MASK 0x800000 static inline uint8_t get_flex_grow(const css_computed_style *style, css_fixed *fixed) { @@ -969,8 +969,8 @@ static inline uint8_t get_flex_grow(const css_computed_style *style, css_fixed #undef FLEX_GROW_MASK #define FLEX_SHRINK_INDEX 14 -#define FLEX_SHRINK_SHIFT 26 -#define FLEX_SHRINK_MASK 0x4000000 +#define FLEX_SHRINK_SHIFT 20 +#define FLEX_SHRINK_MASK 0x100000 static inline uint8_t get_flex_shrink(const css_computed_style *style, css_fixed *fixed) { @@ -989,9 +989,9 @@ static inline uint8_t get_flex_shrink(const css_computed_style *style, #undef FLEX_SHRINK_SHIFT #undef FLEX_SHRINK_MASK -#define FLEX_WRAP_INDEX 14 -#define FLEX_WRAP_SHIFT 30 -#define FLEX_WRAP_MASK 0xc0000000 +#define FLEX_WRAP_INDEX 10 +#define FLEX_WRAP_SHIFT 12 +#define FLEX_WRAP_MASK 0x3000 static inline uint8_t get_flex_wrap(const css_computed_style *style) { uint32_t bits = style->i.bits[FLEX_WRAP_INDEX]; @@ -1006,9 +1006,9 @@ static inline uint8_t get_flex_wrap(const css_computed_style *style) #undef FLEX_WRAP_SHIFT #undef FLEX_WRAP_MASK -#define FLOAT_INDEX 10 -#define FLOAT_SHIFT 12 -#define FLOAT_MASK 0x3000 +#define FLOAT_INDEX 11 +#define FLOAT_SHIFT 6 +#define FLOAT_MASK 0xc0 static inline uint8_t get_float(const css_computed_style *style) { uint32_t bits = style->i.bits[FLOAT_INDEX]; @@ -1024,8 +1024,8 @@ static inline uint8_t get_float(const css_computed_style *style) #undef FLOAT_MASK #define FONT_FAMILY_INDEX 9 -#define FONT_FAMILY_SHIFT 29 -#define FONT_FAMILY_MASK 0xe0000000 +#define FONT_FAMILY_SHIFT 26 +#define FONT_FAMILY_MASK 0x1c000000 static inline uint8_t get_font_family(const css_computed_style *style, lwc_string ***string_arr) { @@ -1042,9 +1042,9 @@ static inline uint8_t get_font_family(const css_computed_style *style, #undef FONT_FAMILY_SHIFT #undef FONT_FAMILY_MASK -#define FONT_SIZE_INDEX 1 -#define FONT_SIZE_SHIFT 23 -#define FONT_SIZE_MASK 0xff800000 +#define FONT_SIZE_INDEX 12 +#define FONT_SIZE_SHIFT 1 +#define FONT_SIZE_MASK 0x3fe static inline uint8_t get_font_size(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1065,8 +1065,8 @@ static inline uint8_t get_font_size(const css_computed_style *style, css_fixed #undef FONT_SIZE_MASK #define FONT_STYLE_INDEX 11 -#define FONT_STYLE_SHIFT 22 -#define FONT_STYLE_MASK 0xc00000 +#define FONT_STYLE_SHIFT 30 +#define FONT_STYLE_MASK 0xc0000000 static inline uint8_t get_font_style(const css_computed_style *style) { uint32_t bits = style->i.bits[FONT_STYLE_INDEX]; @@ -1082,8 +1082,8 @@ static inline uint8_t get_font_style(const css_computed_style *style) #undef FONT_STYLE_MASK #define FONT_VARIANT_INDEX 11 -#define FONT_VARIANT_SHIFT 4 -#define FONT_VARIANT_MASK 0x30 +#define FONT_VARIANT_SHIFT 22 +#define FONT_VARIANT_MASK 0xc00000 static inline uint8_t get_font_variant(const css_computed_style *style) { uint32_t bits = style->i.bits[FONT_VARIANT_INDEX]; @@ -1098,9 +1098,9 @@ static inline uint8_t get_font_variant(const css_computed_style *style) #undef FONT_VARIANT_SHIFT #undef FONT_VARIANT_MASK -#define FONT_WEIGHT_INDEX 13 -#define FONT_WEIGHT_SHIFT 28 -#define FONT_WEIGHT_MASK 0xf0000000 +#define FONT_WEIGHT_INDEX 4 +#define FONT_WEIGHT_SHIFT 0 +#define FONT_WEIGHT_MASK 0xf static inline uint8_t get_font_weight(const css_computed_style *style) { uint32_t bits = style->i.bits[FONT_WEIGHT_INDEX]; @@ -1115,7 +1115,7 @@ static inline uint8_t get_font_weight(const css_computed_style *style) #undef FONT_WEIGHT_SHIFT #undef FONT_WEIGHT_MASK -#define HEIGHT_INDEX 4 +#define HEIGHT_INDEX 5 #define HEIGHT_SHIFT 18 #define HEIGHT_MASK 0x1fc0000 static inline uint8_t get_height(const css_computed_style *style, css_fixed @@ -1137,9 +1137,9 @@ static inline uint8_t get_height(const css_computed_style *style, css_fixed #undef HEIGHT_SHIFT #undef HEIGHT_MASK -#define JUSTIFY_CONTENT_INDEX 9 -#define JUSTIFY_CONTENT_SHIFT 14 -#define JUSTIFY_CONTENT_MASK 0x1c000 +#define JUSTIFY_CONTENT_INDEX 10 +#define JUSTIFY_CONTENT_SHIFT 29 +#define JUSTIFY_CONTENT_MASK 0xe0000000 static inline uint8_t get_justify_content(const css_computed_style *style) { uint32_t bits = style->i.bits[JUSTIFY_CONTENT_INDEX]; @@ -1154,7 +1154,7 @@ static inline uint8_t get_justify_content(const css_computed_style *style) #undef JUSTIFY_CONTENT_SHIFT #undef JUSTIFY_CONTENT_MASK -#define LEFT_INDEX 5 +#define LEFT_INDEX 4 #define LEFT_SHIFT 4 #define LEFT_MASK 0x7f0 static inline uint8_t get_left( @@ -1187,9 +1187,9 @@ static inline uint8_t get_left_bits( #undef LEFT_SHIFT #undef LEFT_MASK -#define LETTER_SPACING_INDEX 7 -#define LETTER_SPACING_SHIFT 11 -#define LETTER_SPACING_MASK 0x3f800 +#define LETTER_SPACING_INDEX 1 +#define LETTER_SPACING_SHIFT 0 +#define LETTER_SPACING_MASK 0x7f static inline uint8_t get_letter_spacing(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1209,9 +1209,9 @@ static inline uint8_t get_letter_spacing(const css_computed_style *style, #undef LETTER_SPACING_SHIFT #undef LETTER_SPACING_MASK -#define LINE_HEIGHT_INDEX 4 -#define LINE_HEIGHT_SHIFT 25 -#define LINE_HEIGHT_MASK 0xfe000000 +#define LINE_HEIGHT_INDEX 5 +#define LINE_HEIGHT_SHIFT 11 +#define LINE_HEIGHT_MASK 0x3f800 static inline uint8_t get_line_height( const css_computed_style *style, css_fixed *length, css_unit *unit) @@ -1236,9 +1236,9 @@ static inline uint8_t get_line_height( #undef LINE_HEIGHT_SHIFT #undef LINE_HEIGHT_MASK -#define LIST_STYLE_IMAGE_INDEX 14 -#define LIST_STYLE_IMAGE_SHIFT 21 -#define LIST_STYLE_IMAGE_MASK 0x200000 +#define LIST_STYLE_IMAGE_INDEX 13 +#define LIST_STYLE_IMAGE_SHIFT 0 +#define LIST_STYLE_IMAGE_MASK 0x1 static inline uint8_t get_list_style_image(const css_computed_style *style, lwc_string **string) { @@ -1255,9 +1255,9 @@ static inline uint8_t get_list_style_image(const css_computed_style *style, #undef LIST_STYLE_IMAGE_SHIFT #undef LIST_STYLE_IMAGE_MASK -#define LIST_STYLE_POSITION_INDEX 11 -#define LIST_STYLE_POSITION_SHIFT 10 -#define LIST_STYLE_POSITION_MASK 0xc00 +#define LIST_STYLE_POSITION_INDEX 14 +#define LIST_STYLE_POSITION_SHIFT 30 +#define LIST_STYLE_POSITION_MASK 0xc0000000 static inline uint8_t get_list_style_position(const css_computed_style *style) { uint32_t bits = style->i.bits[LIST_STYLE_POSITION_INDEX]; @@ -1272,9 +1272,9 @@ static inline uint8_t get_list_style_position(const css_computed_style *style) #undef LIST_STYLE_POSITION_SHIFT #undef LIST_STYLE_POSITION_MASK -#define LIST_STYLE_TYPE_INDEX 8 -#define LIST_STYLE_TYPE_SHIFT 0 -#define LIST_STYLE_TYPE_MASK 0xf +#define LIST_STYLE_TYPE_INDEX 13 +#define LIST_STYLE_TYPE_SHIFT 20 +#define LIST_STYLE_TYPE_MASK 0xf00000 static inline uint8_t get_list_style_type(const css_computed_style *style) { uint32_t bits = style->i.bits[LIST_STYLE_TYPE_INDEX]; @@ -1289,9 +1289,9 @@ static inline uint8_t get_list_style_type(const css_computed_style *style) #undef LIST_STYLE_TYPE_SHIFT #undef LIST_STYLE_TYPE_MASK -#define MARGIN_BOTTOM_INDEX 4 -#define MARGIN_BOTTOM_SHIFT 4 -#define MARGIN_BOTTOM_MASK 0x7f0 +#define MARGIN_BOTTOM_INDEX 3 +#define MARGIN_BOTTOM_SHIFT 18 +#define MARGIN_BOTTOM_MASK 0x1fc0000 static inline uint8_t get_margin_bottom(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1311,9 +1311,9 @@ static inline uint8_t get_margin_bottom(const css_computed_style *style, #undef MARGIN_BOTTOM_SHIFT #undef MARGIN_BOTTOM_MASK -#define MARGIN_LEFT_INDEX 6 -#define MARGIN_LEFT_SHIFT 4 -#define MARGIN_LEFT_MASK 0x7f0 +#define MARGIN_LEFT_INDEX 3 +#define MARGIN_LEFT_SHIFT 11 +#define MARGIN_LEFT_MASK 0x3f800 static inline uint8_t get_margin_left(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1333,7 +1333,7 @@ static inline uint8_t get_margin_left(const css_computed_style *style, #undef MARGIN_LEFT_SHIFT #undef MARGIN_LEFT_MASK -#define MARGIN_RIGHT_INDEX 7 +#define MARGIN_RIGHT_INDEX 6 #define MARGIN_RIGHT_SHIFT 4 #define MARGIN_RIGHT_MASK 0x7f0 static inline uint8_t get_margin_right(const css_computed_style *style, @@ -1355,9 +1355,9 @@ static inline uint8_t get_margin_right(const css_computed_style *style, #undef MARGIN_RIGHT_SHIFT #undef MARGIN_RIGHT_MASK -#define MARGIN_TOP_INDEX 5 -#define MARGIN_TOP_SHIFT 18 -#define MARGIN_TOP_MASK 0x1fc0000 +#define MARGIN_TOP_INDEX 7 +#define MARGIN_TOP_SHIFT 4 +#define MARGIN_TOP_MASK 0x7f0 static inline uint8_t get_margin_top(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1377,9 +1377,9 @@ static inline uint8_t get_margin_top(const css_computed_style *style, css_fixed #undef MARGIN_TOP_SHIFT #undef MARGIN_TOP_MASK -#define MAX_HEIGHT_INDEX 5 -#define MAX_HEIGHT_SHIFT 11 -#define MAX_HEIGHT_MASK 0x3f800 +#define MAX_HEIGHT_INDEX 6 +#define MAX_HEIGHT_SHIFT 18 +#define MAX_HEIGHT_MASK 0x1fc0000 static inline uint8_t get_max_height(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1399,7 +1399,7 @@ static inline uint8_t get_max_height(const css_computed_style *style, css_fixed #undef MAX_HEIGHT_SHIFT #undef MAX_HEIGHT_MASK -#define MAX_WIDTH_INDEX 6 +#define MAX_WIDTH_INDEX 3 #define MAX_WIDTH_SHIFT 25 #define MAX_WIDTH_MASK 0xfe000000 static inline uint8_t get_max_width(const css_computed_style *style, css_fixed @@ -1421,9 +1421,9 @@ static inline uint8_t get_max_width(const css_computed_style *style, css_fixed #undef MAX_WIDTH_SHIFT #undef MAX_WIDTH_MASK -#define MIN_HEIGHT_INDEX 3 -#define MIN_HEIGHT_SHIFT 25 -#define MIN_HEIGHT_MASK 0xfe000000 +#define MIN_HEIGHT_INDEX 7 +#define MIN_HEIGHT_SHIFT 11 +#define MIN_HEIGHT_MASK 0x3f800 static inline uint8_t get_min_height(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1443,9 +1443,9 @@ static inline uint8_t get_min_height(const css_computed_style *style, css_fixed #undef MIN_HEIGHT_SHIFT #undef MIN_HEIGHT_MASK -#define MIN_WIDTH_INDEX 7 -#define MIN_WIDTH_SHIFT 25 -#define MIN_WIDTH_MASK 0xfe000000 +#define MIN_WIDTH_INDEX 6 +#define MIN_WIDTH_SHIFT 11 +#define MIN_WIDTH_MASK 0x3f800 static inline uint8_t get_min_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1466,8 +1466,8 @@ static inline uint8_t get_min_width(const css_computed_style *style, css_fixed #undef MIN_WIDTH_MASK #define OPACITY_INDEX 14 -#define OPACITY_SHIFT 24 -#define OPACITY_MASK 0x1000000 +#define OPACITY_SHIFT 25 +#define OPACITY_MASK 0x2000000 static inline uint8_t get_opacity(const css_computed_style *style, css_fixed *fixed) { @@ -1486,9 +1486,9 @@ static inline uint8_t get_opacity(const css_computed_style *style, css_fixed #undef OPACITY_SHIFT #undef OPACITY_MASK -#define ORDER_INDEX 12 -#define ORDER_SHIFT 0 -#define ORDER_MASK 0x1 +#define ORDER_INDEX 14 +#define ORDER_SHIFT 26 +#define ORDER_MASK 0x4000000 static inline uint8_t get_order(const css_computed_style *style, int32_t *integer) { @@ -1508,8 +1508,8 @@ static inline uint8_t get_order(const css_computed_style *style, int32_t #undef ORDER_MASK #define ORPHANS_INDEX 14 -#define ORPHANS_SHIFT 20 -#define ORPHANS_MASK 0x100000 +#define ORPHANS_SHIFT 22 +#define ORPHANS_MASK 0x400000 static inline uint8_t get_orphans(const css_computed_style *style, int32_t *integer) { @@ -1527,8 +1527,8 @@ static inline uint8_t get_orphans(const css_computed_style *style, int32_t #undef ORPHANS_MASK #define OUTLINE_COLOR_INDEX 11 -#define OUTLINE_COLOR_SHIFT 20 -#define OUTLINE_COLOR_MASK 0x300000 +#define OUTLINE_COLOR_SHIFT 12 +#define OUTLINE_COLOR_MASK 0x3000 static inline uint8_t get_outline_color(const css_computed_style *style, css_color *color) { @@ -1547,9 +1547,9 @@ static inline uint8_t get_outline_color(const css_computed_style *style, #undef OUTLINE_COLOR_SHIFT #undef OUTLINE_COLOR_MASK -#define OUTLINE_STYLE_INDEX 13 -#define OUTLINE_STYLE_SHIFT 24 -#define OUTLINE_STYLE_MASK 0xf000000 +#define OUTLINE_STYLE_INDEX 5 +#define OUTLINE_STYLE_SHIFT 0 +#define OUTLINE_STYLE_MASK 0xf static inline uint8_t get_outline_style(const css_computed_style *style) { uint32_t bits = style->i.bits[OUTLINE_STYLE_INDEX]; @@ -1565,8 +1565,8 @@ static inline uint8_t get_outline_style(const css_computed_style *style) #undef OUTLINE_STYLE_MASK #define OUTLINE_WIDTH_INDEX 0 -#define OUTLINE_WIDTH_SHIFT 0 -#define OUTLINE_WIDTH_MASK 0xff +#define OUTLINE_WIDTH_SHIFT 16 +#define OUTLINE_WIDTH_MASK 0xff0000 static inline uint8_t get_outline_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1586,9 +1586,9 @@ static inline uint8_t get_outline_width(const css_computed_style *style, #undef OUTLINE_WIDTH_SHIFT #undef OUTLINE_WIDTH_MASK -#define OVERFLOW_X_INDEX 10 -#define OVERFLOW_X_SHIFT 29 -#define OVERFLOW_X_MASK 0xe0000000 +#define OVERFLOW_X_INDEX 9 +#define OVERFLOW_X_SHIFT 14 +#define OVERFLOW_X_MASK 0x1c000 static inline uint8_t get_overflow_x(const css_computed_style *style) { uint32_t bits = style->i.bits[OVERFLOW_X_INDEX]; @@ -1603,9 +1603,9 @@ static inline uint8_t get_overflow_x(const css_computed_style *style) #undef OVERFLOW_X_SHIFT #undef OVERFLOW_X_MASK -#define OVERFLOW_Y_INDEX 10 -#define OVERFLOW_Y_SHIFT 20 -#define OVERFLOW_Y_MASK 0x700000 +#define OVERFLOW_Y_INDEX 9 +#define OVERFLOW_Y_SHIFT 11 +#define OVERFLOW_Y_MASK 0x3800 static inline uint8_t get_overflow_y(const css_computed_style *style) { uint32_t bits = style->i.bits[OVERFLOW_Y_INDEX]; @@ -1621,8 +1621,8 @@ static inline uint8_t get_overflow_y(const css_computed_style *style) #undef OVERFLOW_Y_MASK #define PADDING_BOTTOM_INDEX 8 -#define PADDING_BOTTOM_SHIFT 26 -#define PADDING_BOTTOM_MASK 0xfc000000 +#define PADDING_BOTTOM_SHIFT 14 +#define PADDING_BOTTOM_MASK 0xfc000 static inline uint8_t get_padding_bottom(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1643,8 +1643,8 @@ static inline uint8_t get_padding_bottom(const css_computed_style *style, #undef PADDING_BOTTOM_MASK #define PADDING_LEFT_INDEX 8 -#define PADDING_LEFT_SHIFT 14 -#define PADDING_LEFT_MASK 0xfc000 +#define PADDING_LEFT_SHIFT 26 +#define PADDING_LEFT_MASK 0xfc000000 static inline uint8_t get_padding_left(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1664,9 +1664,9 @@ static inline uint8_t get_padding_left(const css_computed_style *style, #undef PADDING_LEFT_SHIFT #undef PADDING_LEFT_MASK -#define PADDING_RIGHT_INDEX 2 -#define PADDING_RIGHT_SHIFT 0 -#define PADDING_RIGHT_MASK 0x3f +#define PADDING_RIGHT_INDEX 8 +#define PADDING_RIGHT_SHIFT 20 +#define PADDING_RIGHT_MASK 0x3f00000 static inline uint8_t get_padding_right(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1686,9 +1686,9 @@ static inline uint8_t get_padding_right(const css_computed_style *style, #undef PADDING_RIGHT_SHIFT #undef PADDING_RIGHT_MASK -#define PADDING_TOP_INDEX 8 -#define PADDING_TOP_SHIFT 20 -#define PADDING_TOP_MASK 0x3f00000 +#define PADDING_TOP_INDEX 2 +#define PADDING_TOP_SHIFT 0 +#define PADDING_TOP_MASK 0x3f static inline uint8_t get_padding_top(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1709,8 +1709,8 @@ static inline uint8_t get_padding_top(const css_computed_style *style, #undef PADDING_TOP_MASK #define PAGE_BREAK_AFTER_INDEX 9 -#define PAGE_BREAK_AFTER_SHIFT 8 -#define PAGE_BREAK_AFTER_MASK 0x700 +#define PAGE_BREAK_AFTER_SHIFT 2 +#define PAGE_BREAK_AFTER_MASK 0x1c static inline uint8_t get_page_break_after(const css_computed_style *style) { uint32_t bits = style->i.bits[PAGE_BREAK_AFTER_INDEX]; @@ -1726,8 +1726,8 @@ static inline uint8_t get_page_break_after(const css_computed_style *style) #undef PAGE_BREAK_AFTER_MASK #define PAGE_BREAK_BEFORE_INDEX 9 -#define PAGE_BREAK_BEFORE_SHIFT 2 -#define PAGE_BREAK_BEFORE_MASK 0x1c +#define PAGE_BREAK_BEFORE_SHIFT 23 +#define PAGE_BREAK_BEFORE_MASK 0x3800000 static inline uint8_t get_page_break_before(const css_computed_style *style) { uint32_t bits = style->i.bits[PAGE_BREAK_BEFORE_INDEX]; @@ -1742,9 +1742,9 @@ static inline uint8_t get_page_break_before(const css_computed_style *style) #undef PAGE_BREAK_BEFORE_SHIFT #undef PAGE_BREAK_BEFORE_MASK -#define PAGE_BREAK_INSIDE_INDEX 11 -#define PAGE_BREAK_INSIDE_SHIFT 0 -#define PAGE_BREAK_INSIDE_MASK 0x3 +#define PAGE_BREAK_INSIDE_INDEX 10 +#define PAGE_BREAK_INSIDE_SHIFT 4 +#define PAGE_BREAK_INSIDE_MASK 0x30 static inline uint8_t get_page_break_inside(const css_computed_style *style) { uint32_t bits = style->i.bits[PAGE_BREAK_INSIDE_INDEX]; @@ -1759,7 +1759,7 @@ static inline uint8_t get_page_break_inside(const css_computed_style *style) #undef PAGE_BREAK_INSIDE_SHIFT #undef PAGE_BREAK_INSIDE_MASK -#define POSITION_INDEX 9 +#define POSITION_INDEX 10 #define POSITION_SHIFT 26 #define POSITION_MASK 0x1c000000 static inline uint8_t get_position(const css_computed_style *style) @@ -1776,9 +1776,9 @@ static inline uint8_t get_position(const css_computed_style *style) #undef POSITION_SHIFT #undef POSITION_MASK -#define QUOTES_INDEX 13 -#define QUOTES_SHIFT 0 -#define QUOTES_MASK 0x1 +#define QUOTES_INDEX 14 +#define QUOTES_SHIFT 27 +#define QUOTES_MASK 0x8000000 static inline uint8_t get_quotes(const css_computed_style *style, lwc_string ***string_arr) { @@ -1796,8 +1796,8 @@ static inline uint8_t get_quotes(const css_computed_style *style, lwc_string #undef QUOTES_MASK #define RIGHT_INDEX 7 -#define RIGHT_SHIFT 18 -#define RIGHT_MASK 0x1fc0000 +#define RIGHT_SHIFT 25 +#define RIGHT_MASK 0xfe000000 static inline uint8_t get_right( const css_computed_style *style, css_fixed *length, css_unit *unit) @@ -1829,8 +1829,8 @@ static inline uint8_t get_right_bits( #undef RIGHT_MASK #define TABLE_LAYOUT_INDEX 11 -#define TABLE_LAYOUT_SHIFT 18 -#define TABLE_LAYOUT_MASK 0xc0000 +#define TABLE_LAYOUT_SHIFT 4 +#define TABLE_LAYOUT_MASK 0x30 static inline uint8_t get_table_layout(const css_computed_style *style) { uint32_t bits = style->i.bits[TABLE_LAYOUT_INDEX]; @@ -1846,8 +1846,8 @@ static inline uint8_t get_table_layout(const css_computed_style *style) #undef TABLE_LAYOUT_MASK #define TEXT_ALIGN_INDEX 13 -#define TEXT_ALIGN_SHIFT 4 -#define TEXT_ALIGN_MASK 0xf0 +#define TEXT_ALIGN_SHIFT 16 +#define TEXT_ALIGN_MASK 0xf0000 static inline uint8_t get_text_align(const css_computed_style *style) { uint32_t bits = style->i.bits[TEXT_ALIGN_INDEX]; @@ -1863,8 +1863,8 @@ static inline uint8_t get_text_align(const css_computed_style *style) #undef TEXT_ALIGN_MASK #define TEXT_DECORATION_INDEX 8 -#define TEXT_DECORATION_SHIFT 4 -#define TEXT_DECORATION_MASK 0x1f0 +#define TEXT_DECORATION_SHIFT 9 +#define TEXT_DECORATION_MASK 0x3e00 static inline uint8_t get_text_decoration(const css_computed_style *style) { uint32_t bits = style->i.bits[TEXT_DECORATION_INDEX]; @@ -1901,9 +1901,9 @@ static inline uint8_t get_text_indent(const css_computed_style *style, #undef TEXT_INDENT_SHIFT #undef TEXT_INDENT_MASK -#define TEXT_TRANSFORM_INDEX 10 -#define TEXT_TRANSFORM_SHIFT 23 -#define TEXT_TRANSFORM_MASK 0x3800000 +#define TEXT_TRANSFORM_INDEX 9 +#define TEXT_TRANSFORM_SHIFT 8 +#define TEXT_TRANSFORM_MASK 0x700 static inline uint8_t get_text_transform(const css_computed_style *style) { uint32_t bits = style->i.bits[TEXT_TRANSFORM_INDEX]; @@ -1918,9 +1918,9 @@ static inline uint8_t get_text_transform(const css_computed_style *style) #undef TEXT_TRANSFORM_SHIFT #undef TEXT_TRANSFORM_MASK -#define TOP_INDEX 1 -#define TOP_SHIFT 0 -#define TOP_MASK 0x7f +#define TOP_INDEX 6 +#define TOP_SHIFT 25 +#define TOP_MASK 0xfe000000 static inline uint8_t get_top( const css_computed_style *style, css_fixed *length, css_unit *unit) @@ -1951,9 +1951,9 @@ static inline uint8_t get_top_bits( #undef TOP_SHIFT #undef TOP_MASK -#define UNICODE_BIDI_INDEX 11 -#define UNICODE_BIDI_SHIFT 6 -#define UNICODE_BIDI_MASK 0xc0 +#define UNICODE_BIDI_INDEX 9 +#define UNICODE_BIDI_SHIFT 0 +#define UNICODE_BIDI_MASK 0x3 static inline uint8_t get_unicode_bidi(const css_computed_style *style) { uint32_t bits = style->i.bits[UNICODE_BIDI_INDEX]; @@ -1968,9 +1968,9 @@ static inline uint8_t get_unicode_bidi(const css_computed_style *style) #undef UNICODE_BIDI_SHIFT #undef UNICODE_BIDI_MASK -#define VERTICAL_ALIGN_INDEX 12 -#define VERTICAL_ALIGN_SHIFT 1 -#define VERTICAL_ALIGN_MASK 0x3fe +#define VERTICAL_ALIGN_INDEX 1 +#define VERTICAL_ALIGN_SHIFT 23 +#define VERTICAL_ALIGN_MASK 0xff800000 static inline uint8_t get_vertical_align(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1990,9 +1990,9 @@ static inline uint8_t get_vertical_align(const css_computed_style *style, #undef VERTICAL_ALIGN_SHIFT #undef VERTICAL_ALIGN_MASK -#define VISIBILITY_INDEX 10 -#define VISIBILITY_SHIFT 18 -#define VISIBILITY_MASK 0xc0000 +#define VISIBILITY_INDEX 11 +#define VISIBILITY_SHIFT 14 +#define VISIBILITY_MASK 0xc000 static inline uint8_t get_visibility(const css_computed_style *style) { uint32_t bits = style->i.bits[VISIBILITY_INDEX]; @@ -2007,9 +2007,9 @@ static inline uint8_t get_visibility(const css_computed_style *style) #undef VISIBILITY_SHIFT #undef VISIBILITY_MASK -#define WHITE_SPACE_INDEX 9 -#define WHITE_SPACE_SHIFT 23 -#define WHITE_SPACE_MASK 0x3800000 +#define WHITE_SPACE_INDEX 10 +#define WHITE_SPACE_SHIFT 20 +#define WHITE_SPACE_MASK 0x700000 static inline uint8_t get_white_space(const css_computed_style *style) { uint32_t bits = style->i.bits[WHITE_SPACE_INDEX]; @@ -2025,8 +2025,8 @@ static inline uint8_t get_white_space(const css_computed_style *style) #undef WHITE_SPACE_MASK #define WIDOWS_INDEX 14 -#define WIDOWS_SHIFT 25 -#define WIDOWS_MASK 0x2000000 +#define WIDOWS_SHIFT 24 +#define WIDOWS_MASK 0x1000000 static inline uint8_t get_widows(const css_computed_style *style, int32_t *integer) { @@ -2043,9 +2043,9 @@ static inline uint8_t get_widows(const css_computed_style *style, int32_t #undef WIDOWS_SHIFT #undef WIDOWS_MASK -#define WIDTH_INDEX 4 -#define WIDTH_SHIFT 11 -#define WIDTH_MASK 0x3f800 +#define WIDTH_INDEX 5 +#define WIDTH_SHIFT 25 +#define WIDTH_MASK 0xfe000000 static inline uint8_t get_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -2065,9 +2065,9 @@ static inline uint8_t get_width(const css_computed_style *style, css_fixed #undef WIDTH_SHIFT #undef WIDTH_MASK -#define WORD_SPACING_INDEX 3 -#define WORD_SPACING_SHIFT 11 -#define WORD_SPACING_MASK 0x3f800 +#define WORD_SPACING_INDEX 4 +#define WORD_SPACING_SHIFT 25 +#define WORD_SPACING_MASK 0xfe000000 static inline uint8_t get_word_spacing(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -2087,9 +2087,9 @@ static inline uint8_t get_word_spacing(const css_computed_style *style, #undef WORD_SPACING_SHIFT #undef WORD_SPACING_MASK -#define WRITING_MODE_INDEX 10 -#define WRITING_MODE_SHIFT 6 -#define WRITING_MODE_MASK 0xc0 +#define WRITING_MODE_INDEX 11 +#define WRITING_MODE_SHIFT 18 +#define WRITING_MODE_MASK 0xc0000 static inline uint8_t get_writing_mode(const css_computed_style *style) { uint32_t bits = style->i.bits[WRITING_MODE_INDEX]; @@ -2104,9 +2104,9 @@ static inline uint8_t get_writing_mode(const css_computed_style *style) #undef WRITING_MODE_SHIFT #undef WRITING_MODE_MASK -#define Z_INDEX_INDEX 10 -#define Z_INDEX_SHIFT 4 -#define Z_INDEX_MASK 0x30 +#define Z_INDEX_INDEX 11 +#define Z_INDEX_SHIFT 2 +#define Z_INDEX_MASK 0xc static inline uint8_t get_z_index(const css_computed_style *style, int32_t *integer) { diff --git a/src/select/autogenerated_propset.h b/src/select/autogenerated_propset.h index 4e0d29d..2854896 100644 --- a/src/select/autogenerated_propset.h +++ b/src/select/autogenerated_propset.h @@ -8,9 +8,9 @@ /** Default values are 'initial value', unless the property is inherited, * in which case it is 'inherit'. */ -#define ALIGN_CONTENT_INDEX 13 -#define ALIGN_CONTENT_SHIFT 1 -#define ALIGN_CONTENT_MASK 0xe +#define ALIGN_CONTENT_INDEX 9 +#define ALIGN_CONTENT_SHIFT 17 +#define ALIGN_CONTENT_MASK 0xe0000 static inline css_error set_align_content(css_computed_style *style, uint8_t type) @@ -30,8 +30,8 @@ static inline css_error set_align_content(css_computed_style *style, uint8_t #undef ALIGN_CONTENT_MASK #define ALIGN_ITEMS_INDEX 9 -#define ALIGN_ITEMS_SHIFT 17 -#define ALIGN_ITEMS_MASK 0xe0000 +#define ALIGN_ITEMS_SHIFT 29 +#define ALIGN_ITEMS_MASK 0xe0000000 static inline css_error set_align_items(css_computed_style *style, uint8_t type) { @@ -50,8 +50,8 @@ static inline css_error set_align_items(css_computed_style *style, uint8_t type) #undef ALIGN_ITEMS_MASK #define ALIGN_SELF_INDEX 9 -#define ALIGN_SELF_SHIFT 5 -#define ALIGN_SELF_MASK 0xe0 +#define ALIGN_SELF_SHIFT 20 +#define ALIGN_SELF_MASK 0x700000 static inline css_error set_align_self(css_computed_style *style, uint8_t type) { @@ -70,8 +70,8 @@ static inline css_error set_align_self(css_computed_style *style, uint8_t type) #undef ALIGN_SELF_MASK #define BACKGROUND_ATTACHMENT_INDEX 10 -#define BACKGROUND_ATTACHMENT_SHIFT 10 -#define BACKGROUND_ATTACHMENT_MASK 0xc00 +#define BACKGROUND_ATTACHMENT_SHIFT 8 +#define BACKGROUND_ATTACHMENT_MASK 0x300 static inline css_error set_background_attachment(css_computed_style *style, uint8_t type) @@ -90,7 +90,7 @@ static inline css_error set_background_attachment(css_computed_style *style, #undef BACKGROUND_ATTACHMENT_SHIFT #undef BACKGROUND_ATTACHMENT_MASK -#define BACKGROUND_COLOR_INDEX 11 +#define BACKGROUND_COLOR_INDEX 10 #define BACKGROUND_COLOR_SHIFT 2 #define BACKGROUND_COLOR_MASK 0xc @@ -146,8 +146,8 @@ static inline css_error set_background_image(css_computed_style *style, uint8_t #undef BACKGROUND_IMAGE_MASK #define BACKGROUND_POSITION_INDEX 12 -#define BACKGROUND_POSITION_SHIFT 21 -#define BACKGROUND_POSITION_MASK 0xffe00000 +#define BACKGROUND_POSITION_SHIFT 10 +#define BACKGROUND_POSITION_MASK 0x1ffc00 static inline css_error set_background_position(css_computed_style *style, uint8_t type, css_fixed length_a, css_unit unit_a, css_fixed @@ -172,9 +172,9 @@ static inline css_error set_background_position(css_computed_style *style, #undef BACKGROUND_POSITION_SHIFT #undef BACKGROUND_POSITION_MASK -#define BACKGROUND_REPEAT_INDEX 10 -#define BACKGROUND_REPEAT_SHIFT 26 -#define BACKGROUND_REPEAT_MASK 0x1c000000 +#define BACKGROUND_REPEAT_INDEX 13 +#define BACKGROUND_REPEAT_SHIFT 1 +#define BACKGROUND_REPEAT_MASK 0xe static inline css_error set_background_repeat(css_computed_style *style, uint8_t type) @@ -193,9 +193,9 @@ static inline css_error set_background_repeat(css_computed_style *style, #undef BACKGROUND_REPEAT_SHIFT #undef BACKGROUND_REPEAT_MASK -#define BORDER_BOTTOM_COLOR_INDEX 10 -#define BORDER_BOTTOM_COLOR_SHIFT 8 -#define BORDER_BOTTOM_COLOR_MASK 0x300 +#define BORDER_BOTTOM_COLOR_INDEX 11 +#define BORDER_BOTTOM_COLOR_SHIFT 28 +#define BORDER_BOTTOM_COLOR_MASK 0x30000000 static inline css_error set_border_bottom_color(css_computed_style *style, uint8_t type, css_color color) @@ -238,8 +238,8 @@ static inline css_error set_border_bottom_style(css_computed_style *style, #undef BORDER_BOTTOM_STYLE_MASK #define BORDER_BOTTOM_WIDTH_INDEX 0 -#define BORDER_BOTTOM_WIDTH_SHIFT 8 -#define BORDER_BOTTOM_WIDTH_MASK 0xff00 +#define BORDER_BOTTOM_WIDTH_SHIFT 0 +#define BORDER_BOTTOM_WIDTH_MASK 0xff static inline css_error set_border_bottom_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -260,9 +260,9 @@ static inline css_error set_border_bottom_width(css_computed_style *style, #undef BORDER_BOTTOM_WIDTH_SHIFT #undef BORDER_BOTTOM_WIDTH_MASK -#define BORDER_COLLAPSE_INDEX 10 -#define BORDER_COLLAPSE_SHIFT 14 -#define BORDER_COLLAPSE_MASK 0xc000 +#define BORDER_COLLAPSE_INDEX 11 +#define BORDER_COLLAPSE_SHIFT 16 +#define BORDER_COLLAPSE_MASK 0x30000 static inline css_error set_border_collapse(css_computed_style *style, uint8_t type) @@ -281,9 +281,9 @@ static inline css_error set_border_collapse(css_computed_style *style, uint8_t #undef BORDER_COLLAPSE_SHIFT #undef BORDER_COLLAPSE_MASK -#define BORDER_LEFT_COLOR_INDEX 11 -#define BORDER_LEFT_COLOR_SHIFT 12 -#define BORDER_LEFT_COLOR_MASK 0x3000 +#define BORDER_LEFT_COLOR_INDEX 10 +#define BORDER_LEFT_COLOR_SHIFT 0 +#define BORDER_LEFT_COLOR_MASK 0x3 static inline css_error set_border_left_color(css_computed_style *style, uint8_t type, css_color color) @@ -305,8 +305,8 @@ static inline css_error set_border_left_color(css_computed_style *style, #undef BORDER_LEFT_COLOR_MASK #define BORDER_LEFT_STYLE_INDEX 13 -#define BORDER_LEFT_STYLE_SHIFT 20 -#define BORDER_LEFT_STYLE_MASK 0xf00000 +#define BORDER_LEFT_STYLE_SHIFT 12 +#define BORDER_LEFT_STYLE_MASK 0xf000 static inline css_error set_border_left_style(css_computed_style *style, uint8_t type) @@ -326,8 +326,8 @@ static inline css_error set_border_left_style(css_computed_style *style, #undef BORDER_LEFT_STYLE_MASK #define BORDER_LEFT_WIDTH_INDEX 0 -#define BORDER_LEFT_WIDTH_SHIFT 16 -#define BORDER_LEFT_WIDTH_MASK 0xff0000 +#define BORDER_LEFT_WIDTH_SHIFT 8 +#define BORDER_LEFT_WIDTH_MASK 0xff00 static inline css_error set_border_left_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -348,9 +348,9 @@ static inline css_error set_border_left_width(css_computed_style *style, #undef BORDER_LEFT_WIDTH_SHIFT #undef BORDER_LEFT_WIDTH_MASK -#define BORDER_RIGHT_COLOR_INDEX 10 -#define BORDER_RIGHT_COLOR_SHIFT 16 -#define BORDER_RIGHT_COLOR_MASK 0x30000 +#define BORDER_RIGHT_COLOR_INDEX 11 +#define BORDER_RIGHT_COLOR_SHIFT 8 +#define BORDER_RIGHT_COLOR_MASK 0x300 static inline css_error set_border_right_color(css_computed_style *style, uint8_t type, css_color color) @@ -371,7 +371,7 @@ static inline css_error set_border_right_color(css_computed_style *style, #undef BORDER_RIGHT_COLOR_SHIFT #undef BORDER_RIGHT_COLOR_MASK -#define BORDER_RIGHT_STYLE_INDEX 7 +#define BORDER_RIGHT_STYLE_INDEX 8 #define BORDER_RIGHT_STYLE_SHIFT 0 #define BORDER_RIGHT_STYLE_MASK 0xf @@ -393,8 +393,8 @@ static inline css_error set_border_right_style(css_computed_style *style, #undef BORDER_RIGHT_STYLE_MASK #define BORDER_RIGHT_WIDTH_INDEX 1 -#define BORDER_RIGHT_WIDTH_SHIFT 15 -#define BORDER_RIGHT_WIDTH_MASK 0x7f8000 +#define BORDER_RIGHT_WIDTH_SHIFT 7 +#define BORDER_RIGHT_WIDTH_MASK 0x7f80 static inline css_error set_border_right_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -416,8 +416,8 @@ static inline css_error set_border_right_width(css_computed_style *style, #undef BORDER_RIGHT_WIDTH_MASK #define BORDER_SPACING_INDEX 12 -#define BORDER_SPACING_SHIFT 10 -#define BORDER_SPACING_MASK 0x1ffc00 +#define BORDER_SPACING_SHIFT 21 +#define BORDER_SPACING_MASK 0xffe00000 static inline css_error set_border_spacing(css_computed_style *style, uint8_t type, css_fixed length_a, css_unit unit_a, css_fixed length_b, @@ -441,9 +441,9 @@ static inline css_error set_border_spacing(css_computed_style *style, uint8_t #undef BORDER_SPACING_SHIFT #undef BORDER_SPACING_MASK -#define BORDER_TOP_COLOR_INDEX 10 -#define BORDER_TOP_COLOR_SHIFT 0 -#define BORDER_TOP_COLOR_MASK 0x3 +#define BORDER_TOP_COLOR_INDEX 11 +#define BORDER_TOP_COLOR_SHIFT 26 +#define BORDER_TOP_COLOR_MASK 0xc000000 static inline css_error set_border_top_color(css_computed_style *style, uint8_t type, css_color color) @@ -464,7 +464,7 @@ static inline css_error set_border_top_color(css_computed_style *style, uint8_t #undef BORDER_TOP_COLOR_SHIFT #undef BORDER_TOP_COLOR_MASK -#define BORDER_TOP_STYLE_INDEX 5 +#define BORDER_TOP_STYLE_INDEX 6 #define BORDER_TOP_STYLE_SHIFT 0 #define BORDER_TOP_STYLE_MASK 0xf @@ -485,9 +485,9 @@ static inline css_error set_border_top_style(css_computed_style *style, uint8_t #undef BORDER_TOP_STYLE_SHIFT #undef BORDER_TOP_STYLE_MASK -#define BORDER_TOP_WIDTH_INDEX 0 -#define BORDER_TOP_WIDTH_SHIFT 24 -#define BORDER_TOP_WIDTH_MASK 0xff000000 +#define BORDER_TOP_WIDTH_INDEX 1 +#define BORDER_TOP_WIDTH_SHIFT 15 +#define BORDER_TOP_WIDTH_MASK 0x7f8000 static inline css_error set_border_top_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -508,9 +508,9 @@ static inline css_error set_border_top_width(css_computed_style *style, uint8_t #undef BORDER_TOP_WIDTH_SHIFT #undef BORDER_TOP_WIDTH_MASK -#define BOTTOM_INDEX 6 -#define BOTTOM_SHIFT 11 -#define BOTTOM_MASK 0x3f800 +#define BOTTOM_INDEX 7 +#define BOTTOM_SHIFT 18 +#define BOTTOM_MASK 0x1fc0000 static inline css_error set_bottom(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -531,9 +531,9 @@ static inline css_error set_bottom(css_computed_style *style, uint8_t type, #undef BOTTOM_SHIFT #undef BOTTOM_MASK -#define BOX_SIZING_INDEX 9 -#define BOX_SIZING_SHIFT 0 -#define BOX_SIZING_MASK 0x3 +#define BOX_SIZING_INDEX 10 +#define BOX_SIZING_SHIFT 18 +#define BOX_SIZING_MASK 0xc0000 static inline css_error set_box_sizing(css_computed_style *style, uint8_t type) { @@ -551,9 +551,9 @@ static inline css_error set_box_sizing(css_computed_style *style, uint8_t type) #undef BOX_SIZING_SHIFT #undef BOX_SIZING_MASK -#define BREAK_AFTER_INDEX 6 -#define BREAK_AFTER_SHIFT 0 -#define BREAK_AFTER_MASK 0xf +#define BREAK_AFTER_INDEX 13 +#define BREAK_AFTER_SHIFT 28 +#define BREAK_AFTER_MASK 0xf0000000 static inline css_error set_break_after(css_computed_style *style, uint8_t type) { @@ -572,8 +572,8 @@ static inline css_error set_break_after(css_computed_style *style, uint8_t type) #undef BREAK_AFTER_MASK #define BREAK_BEFORE_INDEX 13 -#define BREAK_BEFORE_SHIFT 12 -#define BREAK_BEFORE_MASK 0xf000 +#define BREAK_BEFORE_SHIFT 24 +#define BREAK_BEFORE_MASK 0xf000000 static inline css_error set_break_before(css_computed_style *style, uint8_t type) @@ -592,9 +592,9 @@ static inline css_error set_break_before(css_computed_style *style, uint8_t #undef BREAK_BEFORE_SHIFT #undef BREAK_BEFORE_MASK -#define BREAK_INSIDE_INDEX 4 -#define BREAK_INSIDE_SHIFT 0 -#define BREAK_INSIDE_MASK 0xf +#define BREAK_INSIDE_INDEX 13 +#define BREAK_INSIDE_SHIFT 4 +#define BREAK_INSIDE_MASK 0xf0 static inline css_error set_break_inside(css_computed_style *style, uint8_t type) @@ -614,8 +614,8 @@ static inline css_error set_break_inside(css_computed_style *style, uint8_t #undef BREAK_INSIDE_MASK #define CAPTION_SIDE_INDEX 11 -#define CAPTION_SIDE_SHIFT 14 -#define CAPTION_SIDE_MASK 0xc000 +#define CAPTION_SIDE_SHIFT 24 +#define CAPTION_SIDE_MASK 0x3000000 static inline css_error set_caption_side(css_computed_style *style, uint8_t type) @@ -634,9 +634,9 @@ static inline css_error set_caption_side(css_computed_style *style, uint8_t #undef CAPTION_SIDE_SHIFT #undef CAPTION_SIDE_MASK -#define CLEAR_INDEX 9 -#define CLEAR_SHIFT 20 -#define CLEAR_MASK 0x700000 +#define CLEAR_INDEX 10 +#define CLEAR_SHIFT 23 +#define CLEAR_MASK 0x3800000 static inline css_error set_clear(css_computed_style *style, uint8_t type) { @@ -696,9 +696,9 @@ static inline css_error set_clip( #undef CLIP_SHIFT #undef CLIP_MASK -#define COLOR_INDEX 14 -#define COLOR_SHIFT 23 -#define COLOR_MASK 0x800000 +#define COLOR_INDEX 12 +#define COLOR_SHIFT 0 +#define COLOR_MASK 0x1 static inline css_error set_color(css_computed_style *style, uint8_t type, css_color color) @@ -718,9 +718,9 @@ static inline css_error set_color(css_computed_style *style, uint8_t type, #undef COLOR_SHIFT #undef COLOR_MASK -#define COLUMN_COUNT_INDEX 10 -#define COLUMN_COUNT_SHIFT 2 -#define COLUMN_COUNT_MASK 0xc +#define COLUMN_COUNT_INDEX 11 +#define COLUMN_COUNT_SHIFT 20 +#define COLUMN_COUNT_MASK 0x300000 static inline css_error set_column_count(css_computed_style *style, uint8_t type, int32_t integer) @@ -742,8 +742,8 @@ static inline css_error set_column_count(css_computed_style *style, uint8_t #undef COLUMN_COUNT_MASK #define COLUMN_FILL_INDEX 11 -#define COLUMN_FILL_SHIFT 16 -#define COLUMN_FILL_MASK 0x30000 +#define COLUMN_FILL_SHIFT 10 +#define COLUMN_FILL_MASK 0xc00 static inline css_error set_column_fill(css_computed_style *style, uint8_t type) { @@ -761,9 +761,9 @@ static inline css_error set_column_fill(css_computed_style *style, uint8_t type) #undef COLUMN_FILL_SHIFT #undef COLUMN_FILL_MASK -#define COLUMN_GAP_INDEX 5 -#define COLUMN_GAP_SHIFT 25 -#define COLUMN_GAP_MASK 0xfe000000 +#define COLUMN_GAP_INDEX 4 +#define COLUMN_GAP_SHIFT 11 +#define COLUMN_GAP_MASK 0x3f800 static inline css_error set_column_gap(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -784,9 +784,9 @@ static inline css_error set_column_gap(css_computed_style *style, uint8_t type, #undef COLUMN_GAP_SHIFT #undef COLUMN_GAP_MASK -#define COLUMN_RULE_COLOR_INDEX 11 -#define COLUMN_RULE_COLOR_SHIFT 30 -#define COLUMN_RULE_COLOR_MASK 0xc0000000 +#define COLUMN_RULE_COLOR_INDEX 10 +#define COLUMN_RULE_COLOR_SHIFT 10 +#define COLUMN_RULE_COLOR_MASK 0xc00 static inline css_error set_column_rule_color(css_computed_style *style, uint8_t type, css_color color) @@ -807,9 +807,9 @@ static inline css_error set_column_rule_color(css_computed_style *style, #undef COLUMN_RULE_COLOR_SHIFT #undef COLUMN_RULE_COLOR_MASK -#define COLUMN_RULE_STYLE_INDEX 13 -#define COLUMN_RULE_STYLE_SHIFT 16 -#define COLUMN_RULE_STYLE_MASK 0xf0000 +#define COLUMN_RULE_STYLE_INDEX 7 +#define COLUMN_RULE_STYLE_SHIFT 0 +#define COLUMN_RULE_STYLE_MASK 0xf static inline css_error set_column_rule_style(css_computed_style *style, uint8_t type) @@ -828,9 +828,9 @@ static inline css_error set_column_rule_style(css_computed_style *style, #undef COLUMN_RULE_STYLE_SHIFT #undef COLUMN_RULE_STYLE_MASK -#define COLUMN_RULE_WIDTH_INDEX 1 -#define COLUMN_RULE_WIDTH_SHIFT 7 -#define COLUMN_RULE_WIDTH_MASK 0x7f80 +#define COLUMN_RULE_WIDTH_INDEX 0 +#define COLUMN_RULE_WIDTH_SHIFT 24 +#define COLUMN_RULE_WIDTH_MASK 0xff000000 static inline css_error set_column_rule_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -851,9 +851,9 @@ static inline css_error set_column_rule_width(css_computed_style *style, #undef COLUMN_RULE_WIDTH_SHIFT #undef COLUMN_RULE_WIDTH_MASK -#define COLUMN_SPAN_INDEX 11 -#define COLUMN_SPAN_SHIFT 24 -#define COLUMN_SPAN_MASK 0x3000000 +#define COLUMN_SPAN_INDEX 10 +#define COLUMN_SPAN_SHIFT 6 +#define COLUMN_SPAN_MASK 0xc0 static inline css_error set_column_span(css_computed_style *style, uint8_t type) { @@ -871,9 +871,9 @@ static inline css_error set_column_span(css_computed_style *style, uint8_t type) #undef COLUMN_SPAN_SHIFT #undef COLUMN_SPAN_MASK -#define COLUMN_WIDTH_INDEX 6 -#define COLUMN_WIDTH_SHIFT 18 -#define COLUMN_WIDTH_MASK 0x1fc0000 +#define COLUMN_WIDTH_INDEX 5 +#define COLUMN_WIDTH_SHIFT 4 +#define COLUMN_WIDTH_MASK 0x7f0 static inline css_error set_column_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -895,8 +895,8 @@ static inline css_error set_column_width(css_computed_style *style, uint8_t #undef COLUMN_WIDTH_MASK #define CONTENT_INDEX 11 -#define CONTENT_SHIFT 8 -#define CONTENT_MASK 0x300 +#define CONTENT_SHIFT 0 +#define CONTENT_MASK 0x3 static inline css_error set_content( css_computed_style *style, uint8_t type, css_computed_content_item *content) @@ -978,8 +978,8 @@ static inline css_error set_content( #undef CONTENT_MASK #define COUNTER_INCREMENT_INDEX 14 -#define COUNTER_INCREMENT_SHIFT 22 -#define COUNTER_INCREMENT_MASK 0x400000 +#define COUNTER_INCREMENT_SHIFT 29 +#define COUNTER_INCREMENT_MASK 0x20000000 static inline css_error set_counter_increment(css_computed_style *style, uint8_t type, css_computed_counter *counter_arr) @@ -1016,8 +1016,8 @@ static inline css_error set_counter_increment(css_computed_style *style, #undef COUNTER_INCREMENT_MASK #define COUNTER_RESET_INDEX 14 -#define COUNTER_RESET_SHIFT 27 -#define COUNTER_RESET_MASK 0x8000000 +#define COUNTER_RESET_SHIFT 21 +#define COUNTER_RESET_MASK 0x200000 static inline css_error set_counter_reset(css_computed_style *style, uint8_t type, css_computed_counter *counter_arr) @@ -1053,9 +1053,9 @@ static inline css_error set_counter_reset(css_computed_style *style, uint8_t #undef COUNTER_RESET_SHIFT #undef COUNTER_RESET_MASK -#define CURSOR_INDEX 3 -#define CURSOR_SHIFT 0 -#define CURSOR_MASK 0x1f +#define CURSOR_INDEX 8 +#define CURSOR_SHIFT 4 +#define CURSOR_MASK 0x1f0 static inline css_error set_cursor(css_computed_style *style, uint8_t type, lwc_string **string_arr) @@ -1091,9 +1091,9 @@ static inline css_error set_cursor(css_computed_style *style, uint8_t type, #undef CURSOR_SHIFT #undef CURSOR_MASK -#define DIRECTION_INDEX 11 -#define DIRECTION_SHIFT 26 -#define DIRECTION_MASK 0xc000000 +#define DIRECTION_INDEX 10 +#define DIRECTION_SHIFT 16 +#define DIRECTION_MASK 0x30000 static inline css_error set_direction(css_computed_style *style, uint8_t type) { @@ -1111,9 +1111,9 @@ static inline css_error set_direction(css_computed_style *style, uint8_t type) #undef DIRECTION_SHIFT #undef DIRECTION_MASK -#define DISPLAY_INDEX 8 -#define DISPLAY_SHIFT 9 -#define DISPLAY_MASK 0x3e00 +#define DISPLAY_INDEX 3 +#define DISPLAY_SHIFT 0 +#define DISPLAY_MASK 0x1f static inline css_error set_display(css_computed_style *style, uint8_t type) { @@ -1131,9 +1131,9 @@ static inline css_error set_display(css_computed_style *style, uint8_t type) #undef DISPLAY_SHIFT #undef DISPLAY_MASK -#define EMPTY_CELLS_INDEX 11 -#define EMPTY_CELLS_SHIFT 28 -#define EMPTY_CELLS_MASK 0x30000000 +#define EMPTY_CELLS_INDEX 10 +#define EMPTY_CELLS_SHIFT 14 +#define EMPTY_CELLS_MASK 0xc000 static inline css_error set_empty_cells(css_computed_style *style, uint8_t type) { @@ -1151,7 +1151,7 @@ static inline css_error set_empty_cells(css_computed_style *style, uint8_t type) #undef EMPTY_CELLS_SHIFT #undef EMPTY_CELLS_MASK -#define FLEX_BASIS_INDEX 3 +#define FLEX_BASIS_INDEX 4 #define FLEX_BASIS_SHIFT 18 #define FLEX_BASIS_MASK 0x1fc0000 @@ -1175,8 +1175,8 @@ static inline css_error set_flex_basis(css_computed_style *style, uint8_t type, #undef FLEX_BASIS_MASK #define FLEX_DIRECTION_INDEX 9 -#define FLEX_DIRECTION_SHIFT 11 -#define FLEX_DIRECTION_MASK 0x3800 +#define FLEX_DIRECTION_SHIFT 5 +#define FLEX_DIRECTION_MASK 0xe0 static inline css_error set_flex_direction(css_computed_style *style, uint8_t type) @@ -1196,8 +1196,8 @@ static inline css_error set_flex_direction(css_computed_style *style, uint8_t #undef FLEX_DIRECTION_MASK #define FLEX_GROW_INDEX 14 -#define FLEX_GROW_SHIFT 29 -#define FLEX_GROW_MASK 0x20000000 +#define FLEX_GROW_SHIFT 23 +#define FLEX_GROW_MASK 0x800000 static inline css_error set_flex_grow(css_computed_style *style, uint8_t type, css_fixed fixed) @@ -1219,8 +1219,8 @@ static inline css_error set_flex_grow(css_computed_style *style, uint8_t type, #undef FLEX_GROW_MASK #define FLEX_SHRINK_INDEX 14 -#define FLEX_SHRINK_SHIFT 26 -#define FLEX_SHRINK_MASK 0x4000000 +#define FLEX_SHRINK_SHIFT 20 +#define FLEX_SHRINK_MASK 0x100000 static inline css_error set_flex_shrink(css_computed_style *style, uint8_t type, css_fixed fixed) @@ -1241,9 +1241,9 @@ static inline css_error set_flex_shrink(css_computed_style *style, uint8_t #undef FLEX_SHRINK_SHIFT #undef FLEX_SHRINK_MASK -#define FLEX_WRAP_INDEX 14 -#define FLEX_WRAP_SHIFT 30 -#define FLEX_WRAP_MASK 0xc0000000 +#define FLEX_WRAP_INDEX 10 +#define FLEX_WRAP_SHIFT 12 +#define FLEX_WRAP_MASK 0x3000 static inline css_error set_flex_wrap(css_computed_style *style, uint8_t type) { @@ -1261,9 +1261,9 @@ static inline css_error set_flex_wrap(css_computed_style *style, uint8_t type) #undef FLEX_WRAP_SHIFT #undef FLEX_WRAP_MASK -#define FLOAT_INDEX 10 -#define FLOAT_SHIFT 12 -#define FLOAT_MASK 0x3000 +#define FLOAT_INDEX 11 +#define FLOAT_SHIFT 6 +#define FLOAT_MASK 0xc0 static inline css_error set_float(css_computed_style *style, uint8_t type) { @@ -1281,8 +1281,8 @@ static inline css_error set_float(css_computed_style *style, uint8_t type) #undef FLOAT_MASK #define FONT_FAMILY_INDEX 9 -#define FONT_FAMILY_SHIFT 29 -#define FONT_FAMILY_MASK 0xe0000000 +#define FONT_FAMILY_SHIFT 26 +#define FONT_FAMILY_MASK 0x1c000000 static inline css_error set_font_family(css_computed_style *style, uint8_t type, lwc_string **string_arr) @@ -1318,9 +1318,9 @@ static inline css_error set_font_family(css_computed_style *style, uint8_t #undef FONT_FAMILY_SHIFT #undef FONT_FAMILY_MASK -#define FONT_SIZE_INDEX 1 -#define FONT_SIZE_SHIFT 23 -#define FONT_SIZE_MASK 0xff800000 +#define FONT_SIZE_INDEX 12 +#define FONT_SIZE_SHIFT 1 +#define FONT_SIZE_MASK 0x3fe static inline css_error set_font_size(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1342,8 +1342,8 @@ static inline css_error set_font_size(css_computed_style *style, uint8_t type, #undef FONT_SIZE_MASK #define FONT_STYLE_INDEX 11 -#define FONT_STYLE_SHIFT 22 -#define FONT_STYLE_MASK 0xc00000 +#define FONT_STYLE_SHIFT 30 +#define FONT_STYLE_MASK 0xc0000000 static inline css_error set_font_style(css_computed_style *style, uint8_t type) { @@ -1362,8 +1362,8 @@ static inline css_error set_font_style(css_computed_style *style, uint8_t type) #undef FONT_STYLE_MASK #define FONT_VARIANT_INDEX 11 -#define FONT_VARIANT_SHIFT 4 -#define FONT_VARIANT_MASK 0x30 +#define FONT_VARIANT_SHIFT 22 +#define FONT_VARIANT_MASK 0xc00000 static inline css_error set_font_variant(css_computed_style *style, uint8_t type) @@ -1382,9 +1382,9 @@ static inline css_error set_font_variant(css_computed_style *style, uint8_t #undef FONT_VARIANT_SHIFT #undef FONT_VARIANT_MASK -#define FONT_WEIGHT_INDEX 13 -#define FONT_WEIGHT_SHIFT 28 -#define FONT_WEIGHT_MASK 0xf0000000 +#define FONT_WEIGHT_INDEX 4 +#define FONT_WEIGHT_SHIFT 0 +#define FONT_WEIGHT_MASK 0xf static inline css_error set_font_weight(css_computed_style *style, uint8_t type) { @@ -1402,7 +1402,7 @@ static inline css_error set_font_weight(css_computed_style *style, uint8_t type) #undef FONT_WEIGHT_SHIFT #undef FONT_WEIGHT_MASK -#define HEIGHT_INDEX 4 +#define HEIGHT_INDEX 5 #define HEIGHT_SHIFT 18 #define HEIGHT_MASK 0x1fc0000 @@ -1425,9 +1425,9 @@ static inline css_error set_height(css_computed_style *style, uint8_t type, #undef HEIGHT_SHIFT #undef HEIGHT_MASK -#define JUSTIFY_CONTENT_INDEX 9 -#define JUSTIFY_CONTENT_SHIFT 14 -#define JUSTIFY_CONTENT_MASK 0x1c000 +#define JUSTIFY_CONTENT_INDEX 10 +#define JUSTIFY_CONTENT_SHIFT 29 +#define JUSTIFY_CONTENT_MASK 0xe0000000 static inline css_error set_justify_content(css_computed_style *style, uint8_t type) @@ -1446,7 +1446,7 @@ static inline css_error set_justify_content(css_computed_style *style, uint8_t #undef JUSTIFY_CONTENT_SHIFT #undef JUSTIFY_CONTENT_MASK -#define LEFT_INDEX 5 +#define LEFT_INDEX 4 #define LEFT_SHIFT 4 #define LEFT_MASK 0x7f0 @@ -1469,9 +1469,9 @@ static inline css_error set_left(css_computed_style *style, uint8_t type, #undef LEFT_SHIFT #undef LEFT_MASK -#define LETTER_SPACING_INDEX 7 -#define LETTER_SPACING_SHIFT 11 -#define LETTER_SPACING_MASK 0x3f800 +#define LETTER_SPACING_INDEX 1 +#define LETTER_SPACING_SHIFT 0 +#define LETTER_SPACING_MASK 0x7f static inline css_error set_letter_spacing(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1492,9 +1492,9 @@ static inline css_error set_letter_spacing(css_computed_style *style, uint8_t #undef LETTER_SPACING_SHIFT #undef LETTER_SPACING_MASK -#define LINE_HEIGHT_INDEX 4 -#define LINE_HEIGHT_SHIFT 25 -#define LINE_HEIGHT_MASK 0xfe000000 +#define LINE_HEIGHT_INDEX 5 +#define LINE_HEIGHT_SHIFT 11 +#define LINE_HEIGHT_MASK 0x3f800 static inline css_error set_line_height(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1515,9 +1515,9 @@ static inline css_error set_line_height(css_computed_style *style, uint8_t #undef LINE_HEIGHT_SHIFT #undef LINE_HEIGHT_MASK -#define LIST_STYLE_IMAGE_INDEX 14 -#define LIST_STYLE_IMAGE_SHIFT 21 -#define LIST_STYLE_IMAGE_MASK 0x200000 +#define LIST_STYLE_IMAGE_INDEX 13 +#define LIST_STYLE_IMAGE_SHIFT 0 +#define LIST_STYLE_IMAGE_MASK 0x1 static inline css_error set_list_style_image(css_computed_style *style, uint8_t type, lwc_string *string) @@ -1547,9 +1547,9 @@ static inline css_error set_list_style_image(css_computed_style *style, uint8_t #undef LIST_STYLE_IMAGE_SHIFT #undef LIST_STYLE_IMAGE_MASK -#define LIST_STYLE_POSITION_INDEX 11 -#define LIST_STYLE_POSITION_SHIFT 10 -#define LIST_STYLE_POSITION_MASK 0xc00 +#define LIST_STYLE_POSITION_INDEX 14 +#define LIST_STYLE_POSITION_SHIFT 30 +#define LIST_STYLE_POSITION_MASK 0xc0000000 static inline css_error set_list_style_position(css_computed_style *style, uint8_t type) @@ -1568,9 +1568,9 @@ static inline css_error set_list_style_position(css_computed_style *style, #undef LIST_STYLE_POSITION_SHIFT #undef LIST_STYLE_POSITION_MASK -#define LIST_STYLE_TYPE_INDEX 8 -#define LIST_STYLE_TYPE_SHIFT 0 -#define LIST_STYLE_TYPE_MASK 0xf +#define LIST_STYLE_TYPE_INDEX 13 +#define LIST_STYLE_TYPE_SHIFT 20 +#define LIST_STYLE_TYPE_MASK 0xf00000 static inline css_error set_list_style_type(css_computed_style *style, uint8_t type) @@ -1589,9 +1589,9 @@ static inline css_error set_list_style_type(css_computed_style *style, uint8_t #undef LIST_STYLE_TYPE_SHIFT #undef LIST_STYLE_TYPE_MASK -#define MARGIN_BOTTOM_INDEX 4 -#define MARGIN_BOTTOM_SHIFT 4 -#define MARGIN_BOTTOM_MASK 0x7f0 +#define MARGIN_BOTTOM_INDEX 3 +#define MARGIN_BOTTOM_SHIFT 18 +#define MARGIN_BOTTOM_MASK 0x1fc0000 static inline css_error set_margin_bottom(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1612,9 +1612,9 @@ static inline css_error set_margin_bottom(css_computed_style *style, uint8_t #undef MARGIN_BOTTOM_SHIFT #undef MARGIN_BOTTOM_MASK -#define MARGIN_LEFT_INDEX 6 -#define MARGIN_LEFT_SHIFT 4 -#define MARGIN_LEFT_MASK 0x7f0 +#define MARGIN_LEFT_INDEX 3 +#define MARGIN_LEFT_SHIFT 11 +#define MARGIN_LEFT_MASK 0x3f800 static inline css_error set_margin_left(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1635,7 +1635,7 @@ static inline css_error set_margin_left(css_computed_style *style, uint8_t #undef MARGIN_LEFT_SHIFT #undef MARGIN_LEFT_MASK -#define MARGIN_RIGHT_INDEX 7 +#define MARGIN_RIGHT_INDEX 6 #define MARGIN_RIGHT_SHIFT 4 #define MARGIN_RIGHT_MASK 0x7f0 @@ -1658,9 +1658,9 @@ static inline css_error set_margin_right(css_computed_style *style, uint8_t #undef MARGIN_RIGHT_SHIFT #undef MARGIN_RIGHT_MASK -#define MARGIN_TOP_INDEX 5 -#define MARGIN_TOP_SHIFT 18 -#define MARGIN_TOP_MASK 0x1fc0000 +#define MARGIN_TOP_INDEX 7 +#define MARGIN_TOP_SHIFT 4 +#define MARGIN_TOP_MASK 0x7f0 static inline css_error set_margin_top(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1681,9 +1681,9 @@ static inline css_error set_margin_top(css_computed_style *style, uint8_t type, #undef MARGIN_TOP_SHIFT #undef MARGIN_TOP_MASK -#define MAX_HEIGHT_INDEX 5 -#define MAX_HEIGHT_SHIFT 11 -#define MAX_HEIGHT_MASK 0x3f800 +#define MAX_HEIGHT_INDEX 6 +#define MAX_HEIGHT_SHIFT 18 +#define MAX_HEIGHT_MASK 0x1fc0000 static inline css_error set_max_height(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1704,7 +1704,7 @@ static inline css_error set_max_height(css_computed_style *style, uint8_t type, #undef MAX_HEIGHT_SHIFT #undef MAX_HEIGHT_MASK -#define MAX_WIDTH_INDEX 6 +#define MAX_WIDTH_INDEX 3 #define MAX_WIDTH_SHIFT 25 #define MAX_WIDTH_MASK 0xfe000000 @@ -1727,9 +1727,9 @@ static inline css_error set_max_width(css_computed_style *style, uint8_t type, #undef MAX_WIDTH_SHIFT #undef MAX_WIDTH_MASK -#define MIN_HEIGHT_INDEX 3 -#define MIN_HEIGHT_SHIFT 25 -#define MIN_HEIGHT_MASK 0xfe000000 +#define MIN_HEIGHT_INDEX 7 +#define MIN_HEIGHT_SHIFT 11 +#define MIN_HEIGHT_MASK 0x3f800 static inline css_error set_min_height(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1750,9 +1750,9 @@ static inline css_error set_min_height(css_computed_style *style, uint8_t type, #undef MIN_HEIGHT_SHIFT #undef MIN_HEIGHT_MASK -#define MIN_WIDTH_INDEX 7 -#define MIN_WIDTH_SHIFT 25 -#define MIN_WIDTH_MASK 0xfe000000 +#define MIN_WIDTH_INDEX 6 +#define MIN_WIDTH_SHIFT 11 +#define MIN_WIDTH_MASK 0x3f800 static inline css_error set_min_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1774,8 +1774,8 @@ static inline css_error set_min_width(css_computed_style *style, uint8_t type, #undef MIN_WIDTH_MASK #define OPACITY_INDEX 14 -#define OPACITY_SHIFT 24 -#define OPACITY_MASK 0x1000000 +#define OPACITY_SHIFT 25 +#define OPACITY_MASK 0x2000000 static inline css_error set_opacity(css_computed_style *style, uint8_t type, css_fixed fixed) @@ -1796,9 +1796,9 @@ static inline css_error set_opacity(css_computed_style *style, uint8_t type, #undef OPACITY_SHIFT #undef OPACITY_MASK -#define ORDER_INDEX 12 -#define ORDER_SHIFT 0 -#define ORDER_MASK 0x1 +#define ORDER_INDEX 14 +#define ORDER_SHIFT 26 +#define ORDER_MASK 0x4000000 static inline css_error set_order(css_computed_style *style, uint8_t type, int32_t integer) @@ -1819,8 +1819,8 @@ static inline css_error set_order(css_computed_style *style, uint8_t type, #undef ORDER_MASK #define ORPHANS_INDEX 14 -#define ORPHANS_SHIFT 20 -#define ORPHANS_MASK 0x100000 +#define ORPHANS_SHIFT 22 +#define ORPHANS_MASK 0x400000 static inline css_error set_orphans(css_computed_style *style, uint8_t type, int32_t integer) @@ -1842,8 +1842,8 @@ static inline css_error set_orphans(css_computed_style *style, uint8_t type, #undef ORPHANS_MASK #define OUTLINE_COLOR_INDEX 11 -#define OUTLINE_COLOR_SHIFT 20 -#define OUTLINE_COLOR_MASK 0x300000 +#define OUTLINE_COLOR_SHIFT 12 +#define OUTLINE_COLOR_MASK 0x3000 static inline css_error set_outline_color(css_computed_style *style, uint8_t type, css_color color) @@ -1864,9 +1864,9 @@ static inline css_error set_outline_color(css_computed_style *style, uint8_t #undef OUTLINE_COLOR_SHIFT #undef OUTLINE_COLOR_MASK -#define OUTLINE_STYLE_INDEX 13 -#define OUTLINE_STYLE_SHIFT 24 -#define OUTLINE_STYLE_MASK 0xf000000 +#define OUTLINE_STYLE_INDEX 5 +#define OUTLINE_STYLE_SHIFT 0 +#define OUTLINE_STYLE_MASK 0xf static inline css_error set_outline_style(css_computed_style *style, uint8_t type) @@ -1886,8 +1886,8 @@ static inline css_error set_outline_style(css_computed_style *style, uint8_t #undef OUTLINE_STYLE_MASK #define OUTLINE_WIDTH_INDEX 0 -#define OUTLINE_WIDTH_SHIFT 0 -#define OUTLINE_WIDTH_MASK 0xff +#define OUTLINE_WIDTH_SHIFT 16 +#define OUTLINE_WIDTH_MASK 0xff0000 static inline css_error set_outline_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1908,9 +1908,9 @@ static inline css_error set_outline_width(css_computed_style *style, uint8_t #undef OUTLINE_WIDTH_SHIFT #undef OUTLINE_WIDTH_MASK -#define OVERFLOW_X_INDEX 10 -#define OVERFLOW_X_SHIFT 29 -#define OVERFLOW_X_MASK 0xe0000000 +#define OVERFLOW_X_INDEX 9 +#define OVERFLOW_X_SHIFT 14 +#define OVERFLOW_X_MASK 0x1c000 static inline css_error set_overflow_x(css_computed_style *style, uint8_t type) { @@ -1928,9 +1928,9 @@ static inline css_error set_overflow_x(css_computed_style *style, uint8_t type) #undef OVERFLOW_X_SHIFT #undef OVERFLOW_X_MASK -#define OVERFLOW_Y_INDEX 10 -#define OVERFLOW_Y_SHIFT 20 -#define OVERFLOW_Y_MASK 0x700000 +#define OVERFLOW_Y_INDEX 9 +#define OVERFLOW_Y_SHIFT 11 +#define OVERFLOW_Y_MASK 0x3800 static inline css_error set_overflow_y(css_computed_style *style, uint8_t type) { @@ -1949,8 +1949,8 @@ static inline css_error set_overflow_y(css_computed_style *style, uint8_t type) #undef OVERFLOW_Y_MASK #define PADDING_BOTTOM_INDEX 8 -#define PADDING_BOTTOM_SHIFT 26 -#define PADDING_BOTTOM_MASK 0xfc000000 +#define PADDING_BOTTOM_SHIFT 14 +#define PADDING_BOTTOM_MASK 0xfc000 static inline css_error set_padding_bottom(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1972,8 +1972,8 @@ static inline css_error set_padding_bottom(css_computed_style *style, uint8_t #undef PADDING_BOTTOM_MASK #define PADDING_LEFT_INDEX 8 -#define PADDING_LEFT_SHIFT 14 -#define PADDING_LEFT_MASK 0xfc000 +#define PADDING_LEFT_SHIFT 26 +#define PADDING_LEFT_MASK 0xfc000000 static inline css_error set_padding_left(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1994,9 +1994,9 @@ static inline css_error set_padding_left(css_computed_style *style, uint8_t #undef PADDING_LEFT_SHIFT #undef PADDING_LEFT_MASK -#define PADDING_RIGHT_INDEX 2 -#define PADDING_RIGHT_SHIFT 0 -#define PADDING_RIGHT_MASK 0x3f +#define PADDING_RIGHT_INDEX 8 +#define PADDING_RIGHT_SHIFT 20 +#define PADDING_RIGHT_MASK 0x3f00000 static inline css_error set_padding_right(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -2017,9 +2017,9 @@ static inline css_error set_padding_right(css_computed_style *style, uint8_t #undef PADDING_RIGHT_SHIFT #undef PADDING_RIGHT_MASK -#define PADDING_TOP_INDEX 8 -#define PADDING_TOP_SHIFT 20 -#define PADDING_TOP_MASK 0x3f00000 +#define PADDING_TOP_INDEX 2 +#define PADDING_TOP_SHIFT 0 +#define PADDING_TOP_MASK 0x3f static inline css_error set_padding_top(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -2041,8 +2041,8 @@ static inline css_error set_padding_top(css_computed_style *style, uint8_t #undef PADDING_TOP_MASK #define PAGE_BREAK_AFTER_INDEX 9 -#define PAGE_BREAK_AFTER_SHIFT 8 -#define PAGE_BREAK_AFTER_MASK 0x700 +#define PAGE_BREAK_AFTER_SHIFT 2 +#define PAGE_BREAK_AFTER_MASK 0x1c static inline css_error set_page_break_after(css_computed_style *style, uint8_t type) @@ -2062,8 +2062,8 @@ static inline css_error set_page_break_after(css_computed_style *style, uint8_t #undef PAGE_BREAK_AFTER_MASK #define PAGE_BREAK_BEFORE_INDEX 9 -#define PAGE_BREAK_BEFORE_SHIFT 2 -#define PAGE_BREAK_BEFORE_MASK 0x1c +#define PAGE_BREAK_BEFORE_SHIFT 23 +#define PAGE_BREAK_BEFORE_MASK 0x3800000 static inline css_error set_page_break_before(css_computed_style *style, uint8_t type) @@ -2082,9 +2082,9 @@ static inline css_error set_page_break_before(css_computed_style *style, #undef PAGE_BREAK_BEFORE_SHIFT #undef PAGE_BREAK_BEFORE_MASK -#define PAGE_BREAK_INSIDE_INDEX 11 -#define PAGE_BREAK_INSIDE_SHIFT 0 -#define PAGE_BREAK_INSIDE_MASK 0x3 +#define PAGE_BREAK_INSIDE_INDEX 10 +#define PAGE_BREAK_INSIDE_SHIFT 4 +#define PAGE_BREAK_INSIDE_MASK 0x30 static inline css_error set_page_break_inside(css_computed_style *style, uint8_t type) @@ -2103,7 +2103,7 @@ static inline css_error set_page_break_inside(css_computed_style *style, #undef PAGE_BREAK_INSIDE_SHIFT #undef PAGE_BREAK_INSIDE_MASK -#define POSITION_INDEX 9 +#define POSITION_INDEX 10 #define POSITION_SHIFT 26 #define POSITION_MASK 0x1c000000 @@ -2123,9 +2123,9 @@ static inline css_error set_position(css_computed_style *style, uint8_t type) #undef POSITION_SHIFT #undef POSITION_MASK -#define QUOTES_INDEX 13 -#define QUOTES_SHIFT 0 -#define QUOTES_MASK 0x1 +#define QUOTES_INDEX 14 +#define QUOTES_SHIFT 27 +#define QUOTES_MASK 0x8000000 static inline css_error set_quotes(css_computed_style *style, uint8_t type, lwc_string **string_arr) @@ -2162,8 +2162,8 @@ static inline css_error set_quotes(css_computed_style *style, uint8_t type, #undef QUOTES_MASK #define RIGHT_INDEX 7 -#define RIGHT_SHIFT 18 -#define RIGHT_MASK 0x1fc0000 +#define RIGHT_SHIFT 25 +#define RIGHT_MASK 0xfe000000 static inline css_error set_right(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -2185,8 +2185,8 @@ static inline css_error set_right(css_computed_style *style, uint8_t type, #undef RIGHT_MASK #define TABLE_LAYOUT_INDEX 11 -#define TABLE_LAYOUT_SHIFT 18 -#define TABLE_LAYOUT_MASK 0xc0000 +#define TABLE_LAYOUT_SHIFT 4 +#define TABLE_LAYOUT_MASK 0x30 static inline css_error set_table_layout(css_computed_style *style, uint8_t type) @@ -2206,8 +2206,8 @@ static inline css_error set_table_layout(css_computed_style *style, uint8_t #undef TABLE_LAYOUT_MASK #define TEXT_ALIGN_INDEX 13 -#define TEXT_ALIGN_SHIFT 4 -#define TEXT_ALIGN_MASK 0xf0 +#define TEXT_ALIGN_SHIFT 16 +#define TEXT_ALIGN_MASK 0xf0000 static inline css_error set_text_align(css_computed_style *style, uint8_t type) { @@ -2226,8 +2226,8 @@ static inline css_error set_text_align(css_computed_style *style, uint8_t type) #undef TEXT_ALIGN_MASK #define TEXT_DECORATION_INDEX 8 -#define TEXT_DECORATION_SHIFT 4 -#define TEXT_DECORATION_MASK 0x1f0 +#define TEXT_DECORATION_SHIFT 9 +#define TEXT_DECORATION_MASK 0x3e00 static inline css_error set_text_decoration(css_computed_style *style, uint8_t type) @@ -2269,9 +2269,9 @@ static inline css_error set_text_indent(css_computed_style *style, uint8_t #undef TEXT_INDENT_SHIFT #undef TEXT_INDENT_MASK -#define TEXT_TRANSFORM_INDEX 10 -#define TEXT_TRANSFORM_SHIFT 23 -#define TEXT_TRANSFORM_MASK 0x3800000 +#define TEXT_TRANSFORM_INDEX 9 +#define TEXT_TRANSFORM_SHIFT 8 +#define TEXT_TRANSFORM_MASK 0x700 static inline css_error set_text_transform(css_computed_style *style, uint8_t type) @@ -2290,9 +2290,9 @@ static inline css_error set_text_transform(css_computed_style *style, uint8_t #undef TEXT_TRANSFORM_SHIFT #undef TEXT_TRANSFORM_MASK -#define TOP_INDEX 1 -#define TOP_SHIFT 0 -#define TOP_MASK 0x7f +#define TOP_INDEX 6 +#define TOP_SHIFT 25 +#define TOP_MASK 0xfe000000 static inline css_error set_top(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -2313,9 +2313,9 @@ static inline css_error set_top(css_computed_style *style, uint8_t type, #undef TOP_SHIFT #undef TOP_MASK -#define UNICODE_BIDI_INDEX 11 -#define UNICODE_BIDI_SHIFT 6 -#define UNICODE_BIDI_MASK 0xc0 +#define UNICODE_BIDI_INDEX 9 +#define UNICODE_BIDI_SHIFT 0 +#define UNICODE_BIDI_MASK 0x3 static inline css_error set_unicode_bidi(css_computed_style *style, uint8_t type) @@ -2334,9 +2334,9 @@ static inline css_error set_unicode_bidi(css_computed_style *style, uint8_t #undef UNICODE_BIDI_SHIFT #undef UNICODE_BIDI_MASK -#define VERTICAL_ALIGN_INDEX 12 -#define VERTICAL_ALIGN_SHIFT 1 -#define VERTICAL_ALIGN_MASK 0x3fe +#define VERTICAL_ALIGN_INDEX 1 +#define VERTICAL_ALIGN_SHIFT 23 +#define VERTICAL_ALIGN_MASK 0xff800000 static inline css_error set_vertical_align(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -2357,9 +2357,9 @@ static inline css_error set_vertical_align(css_computed_style *style, uint8_t #undef VERTICAL_ALIGN_SHIFT #undef VERTICAL_ALIGN_MASK -#define VISIBILITY_INDEX 10 -#define VISIBILITY_SHIFT 18 -#define VISIBILITY_MASK 0xc0000 +#define VISIBILITY_INDEX 11 +#define VISIBILITY_SHIFT 14 +#define VISIBILITY_MASK 0xc000 static inline css_error set_visibility(css_computed_style *style, uint8_t type) { @@ -2377,9 +2377,9 @@ static inline css_error set_visibility(css_computed_style *style, uint8_t type) #undef VISIBILITY_SHIFT #undef VISIBILITY_MASK -#define WHITE_SPACE_INDEX 9 -#define WHITE_SPACE_SHIFT 23 -#define WHITE_SPACE_MASK 0x3800000 +#define WHITE_SPACE_INDEX 10 +#define WHITE_SPACE_SHIFT 20 +#define WHITE_SPACE_MASK 0x700000 static inline css_error set_white_space(css_computed_style *style, uint8_t type) { @@ -2398,8 +2398,8 @@ static inline css_error set_white_space(css_computed_style *style, uint8_t type) #undef WHITE_SPACE_MASK #define WIDOWS_INDEX 14 -#define WIDOWS_SHIFT 25 -#define WIDOWS_MASK 0x2000000 +#define WIDOWS_SHIFT 24 +#define WIDOWS_MASK 0x1000000 static inline css_error set_widows(css_computed_style *style, uint8_t type, int32_t integer) @@ -2420,9 +2420,9 @@ static inline css_error set_widows(css_computed_style *style, uint8_t type, #undef WIDOWS_SHIFT #undef WIDOWS_MASK -#define WIDTH_INDEX 4 -#define WIDTH_SHIFT 11 -#define WIDTH_MASK 0x3f800 +#define WIDTH_INDEX 5 +#define WIDTH_SHIFT 25 +#define WIDTH_MASK 0xfe000000 static inline css_error set_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -2443,9 +2443,9 @@ static inline css_error set_width(css_computed_style *style, uint8_t type, #undef WIDTH_SHIFT #undef WIDTH_MASK -#define WORD_SPACING_INDEX 3 -#define WORD_SPACING_SHIFT 11 -#define WORD_SPACING_MASK 0x3f800 +#define WORD_SPACING_INDEX 4 +#define WORD_SPACING_SHIFT 25 +#define WORD_SPACING_MASK 0xfe000000 static inline css_error set_word_spacing(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -2466,9 +2466,9 @@ static inline css_error set_word_spacing(css_computed_style *style, uint8_t #undef WORD_SPACING_SHIFT #undef WORD_SPACING_MASK -#define WRITING_MODE_INDEX 10 -#define WRITING_MODE_SHIFT 6 -#define WRITING_MODE_MASK 0xc0 +#define WRITING_MODE_INDEX 11 +#define WRITING_MODE_SHIFT 18 +#define WRITING_MODE_MASK 0xc0000 static inline css_error set_writing_mode(css_computed_style *style, uint8_t type) @@ -2487,9 +2487,9 @@ static inline css_error set_writing_mode(css_computed_style *style, uint8_t #undef WRITING_MODE_SHIFT #undef WRITING_MODE_MASK -#define Z_INDEX_INDEX 10 -#define Z_INDEX_SHIFT 4 -#define Z_INDEX_MASK 0x30 +#define Z_INDEX_INDEX 11 +#define Z_INDEX_SHIFT 2 +#define Z_INDEX_MASK 0xc static inline css_error set_z_index(css_computed_style *style, uint8_t type, int32_t integer) diff --git a/src/select/computed.c b/src/select/computed.c index 83bbf10..190ca83 100644 --- a/src/select/computed.c +++ b/src/select/computed.c @@ -101,10 +101,6 @@ css_error css_computed_style_destroy(css_computed_style *style) css__arena_remove_style(style); } - if (style->i.aural != NULL) { - free(style->i.aural); - } - if (style->counter_increment != NULL) { css_computed_counter *c; @@ -225,8 +221,7 @@ css_error css__computed_style_initialise(css_computed_style *style, for (i = 0; i < CSS_N_PROPERTIES; i++) { /* No need to initialise anything other than the normal * properties -- the others are handled by the accessors */ - if (prop_dispatch[i].inherited == false && - prop_dispatch[i].group == GROUP_NORMAL) { + if (prop_dispatch[i].inherited == false) { error = prop_dispatch[i].initial(&state); if (error != CSS_OK) return error; @@ -273,16 +268,6 @@ css_error css_computed_style_compose( /* Iterate through the properties */ for (i = 0; i < CSS_N_PROPERTIES; i++) { - /* Skip any in extension blocks if the block does not exist */ - switch(prop_dispatch[i].group) { - case GROUP_NORMAL: - break; - case GROUP_AURAL: - if (parent->i.aural == NULL && child->i.aural == NULL) - continue; - break; - } - /* Compose the property */ error = prop_dispatch[i].compose(parent, child, composed); if (error != CSS_OK) diff --git a/src/select/dispatch.c b/src/select/dispatch.c index 3ab4c96..30bba25 100644 --- a/src/select/dispatch.c +++ b/src/select/dispatch.c @@ -21,621 +21,497 @@ struct prop_table prop_dispatch[CSS_N_PROPERTIES] = { { PROPERTY_FUNCS(azimuth), 1, - GROUP_AURAL }, { PROPERTY_FUNCS(background_attachment), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(background_color), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(background_image), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(background_position), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(background_repeat), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(border_collapse), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(border_spacing), 1, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(border_top_color), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(border_right_color), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(border_bottom_color), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(border_left_color), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(border_top_style), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(border_right_style), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(border_bottom_style), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(border_left_style), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(border_top_width), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(border_right_width), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(border_bottom_width), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(border_left_width), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(bottom), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(caption_side), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(clear), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(clip), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(color), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(content), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(counter_increment), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(counter_reset), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(cue_after), 0, - GROUP_AURAL }, { PROPERTY_FUNCS(cue_before), 0, - GROUP_AURAL }, { PROPERTY_FUNCS(cursor), 1, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(direction), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(display), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(elevation), 1, - GROUP_AURAL }, { PROPERTY_FUNCS(empty_cells), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(float), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(font_family), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(font_size), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(font_style), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(font_variant), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(font_weight), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(height), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(left), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(letter_spacing), 1, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(line_height), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(list_style_image), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(list_style_position), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(list_style_type), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(margin_top), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(margin_right), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(margin_bottom), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(margin_left), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(max_height), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(max_width), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(min_height), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(min_width), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(orphans), 1, - GROUP_PAGE }, { PROPERTY_FUNCS(outline_color), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(outline_style), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(outline_width), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(overflow_x), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(padding_top), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(padding_right), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(padding_bottom), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(padding_left), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(page_break_after), 0, - GROUP_PAGE }, { PROPERTY_FUNCS(page_break_before), 0, - GROUP_PAGE }, { PROPERTY_FUNCS(page_break_inside), 1, - GROUP_PAGE }, { PROPERTY_FUNCS(pause_after), 0, - GROUP_AURAL }, { PROPERTY_FUNCS(pause_before), 0, - GROUP_AURAL }, { PROPERTY_FUNCS(pitch_range), 1, - GROUP_AURAL }, { PROPERTY_FUNCS(pitch), 1, - GROUP_AURAL }, { PROPERTY_FUNCS(play_during), 0, - GROUP_AURAL }, { PROPERTY_FUNCS(position), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(quotes), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(richness), 1, - GROUP_AURAL }, { PROPERTY_FUNCS(right), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(speak_header), 1, - GROUP_AURAL }, { PROPERTY_FUNCS(speak_numeral), 1, - GROUP_AURAL }, { PROPERTY_FUNCS(speak_punctuation), 1, - GROUP_AURAL }, { PROPERTY_FUNCS(speak), 1, - GROUP_AURAL }, { PROPERTY_FUNCS(speech_rate), 1, - GROUP_AURAL }, { PROPERTY_FUNCS(stress), 1, - GROUP_AURAL }, { PROPERTY_FUNCS(table_layout), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(text_align), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(text_decoration), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(text_indent), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(text_transform), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(top), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(unicode_bidi), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(vertical_align), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(visibility), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(voice_family), 1, - GROUP_AURAL }, { PROPERTY_FUNCS(volume), 1, - GROUP_AURAL }, { PROPERTY_FUNCS(white_space), 1, - GROUP_NORMAL }, { PROPERTY_FUNCS(widows), 1, - GROUP_PAGE }, { PROPERTY_FUNCS(width), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(word_spacing), 1, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(z_index), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(opacity), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(break_after), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(break_before), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(break_inside), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(column_count), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(column_fill), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(column_gap), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(column_rule_color), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(column_rule_style), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(column_rule_width), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(column_span), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(column_width), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(writing_mode), 0, - GROUP_UNCOMMON }, { PROPERTY_FUNCS(overflow_y), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(box_sizing), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(align_content), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(align_items), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(align_self), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(flex_basis), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(flex_direction), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(flex_grow), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(flex_shrink), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(flex_wrap), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(justify_content), 0, - GROUP_NORMAL }, { PROPERTY_FUNCS(order), 0, - GROUP_NORMAL } }; diff --git a/src/select/dispatch.h b/src/select/dispatch.h index c1db7d9..e3f93a3 100644 --- a/src/select/dispatch.h +++ b/src/select/dispatch.h @@ -17,16 +17,6 @@ #include "bytecode/bytecode.h" #include "select/select.h" -/** - * Enumeration of property groups - */ -enum prop_group { - GROUP_NORMAL = 0x0, - GROUP_UNCOMMON = 0x1, - GROUP_PAGE = 0x2, - GROUP_AURAL = 0x3 -}; - extern struct prop_table { css_error (*cascade)(uint32_t opv, css_style *style, css_select_state *state); @@ -37,7 +27,6 @@ extern struct prop_table { const css_computed_style *child, css_computed_style *result); unsigned int inherited; - unsigned int group; } prop_dispatch[CSS_N_PROPERTIES]; #endif diff --git a/src/select/select.c b/src/select/select.c index 6a95b97..f6efbfe 100644 --- a/src/select/select.c +++ b/src/select/select.c @@ -1811,29 +1811,6 @@ css_error set_initial(css_select_state *state, */ if (prop_dispatch[prop].inherited == false || (pseudo == CSS_PSEUDO_ELEMENT_NONE && parent == NULL)) { - enum prop_group group = prop_dispatch[prop].group; - - /* Remaining properties are neither inherited nor - * already set. Thus, we set them to their initial - * values here. Except, however, if the property in - * question resides in one of the extension blocks and - * the extension block has yet to be allocated. In that - * case, we do nothing and leave it to the property - * accessors to return the initial values for the - * property. - */ - switch (group) { - case GROUP_NORMAL: - break; - case GROUP_UNCOMMON: - break; - case GROUP_PAGE: - break; - case GROUP_AURAL: - if (state->computed->i.aural == NULL) - return CSS_OK; - break; - } error = prop_dispatch[prop].initial(state); if (error != CSS_OK) return error; diff --git a/src/select/select_generator.py b/src/select/select_generator.py index 7427a88..2d6afe8 100644 --- a/src/select/select_generator.py +++ b/src/select/select_generator.py @@ -495,7 +495,6 @@ class CSSGroup: for g in css_groups: if g.name is not 'style' and g.name is not 'page': t.append('css_computed_{0} *{0};'.format(g.name)) - t.append('void *aural;') t.indent(-1) t.append('}}{};'.format( -- cgit v1.2.3