diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2021-02-09 22:03:22 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2021-02-09 22:03:22 +0000 |
| commit | 3ccff93d3a494b9303a1cc55c4075ef0c59eaf4f (patch) | |
| tree | 4a20a77fa06e9fc65bb911bdb48872f578acd4d2 | |
| parent | 35f499b333d1f97c47ac5581143ce9806d1c3536 (diff) | |
| download | libcss-3ccff93d3a494b9303a1cc55c4075ef0c59eaf4f.tar.gz | |
Use two more bits, six total, for the list style property
Adding the two bits that were previously reserved (Must Be Zero) for
use in the list style property gives space for sixty four styles
instead of sixteen.
| -rw-r--r-- | docs/Bytecode | 40 | ||||
| -rw-r--r-- | src/select/autogenerated_computed.h | 82 | ||||
| -rw-r--r-- | src/select/autogenerated_propget.h | 484 | ||||
| -rw-r--r-- | src/select/autogenerated_propset.h | 484 | ||||
| -rw-r--r-- | src/select/select_config.py | 2 |
5 files changed, 546 insertions, 546 deletions
diff --git a/docs/Bytecode b/docs/Bytecode index 880ccbd..d691923 100644 --- a/docs/Bytecode +++ b/docs/Bytecode @@ -342,11 +342,9 @@ Opcodes bits 0-6: 0000000 => string, 0000001 => uri, 0000010 => counter, - bits 12-13: MBZ - bits 8-11 : list-style-type + bits 8-13 : list-style-type 0000011 => counters, - bits 12-13: MBZ - bits 8-11 : list-style-type + bits 8-13 : list-style-type 0000100 => attr, other => rffe. bit 7 clear => keywords: @@ -646,22 +644,24 @@ Opcodes 2f - list-style-type <value> (14bits) : - 0 => disc, - 1 => circle, - 2 => square, - 3 => decimal, - 4 => decimal-leading-zero, - 5 => lower-roman, - 6 => upper-roman, - 7 => lower-greek, - 8 => lower-latin, - 9 => upper-latin, - a => armenian, - b => georgian, - c => lower-alpha, - d => upper-alpha, - e => none, - other => Reserved for future expansion. + bits 6-13: MBZ + bits 0-5 : + 0 => disc, + 1 => circle, + 2 => square, + 3 => decimal, + 4 => decimal-leading-zero, + 5 => lower-roman, + 6 => upper-roman, + 7 => lower-greek, + 8 => lower-latin, + 9 => upper-latin, + a => armenian, + b => georgian, + c => lower-alpha, + d => upper-alpha, + e => none, + other => Reserved for future expansion. 30 - margin-top 31 - margin-right diff --git a/src/select/autogenerated_computed.h b/src/select/autogenerated_computed.h index 4d21fad..7765f35 100644 --- a/src/select/autogenerated_computed.h +++ b/src/select/autogenerated_computed.h @@ -69,7 +69,7 @@ struct css_computed_style_i { * line_height 2 + 5 4 * list_style_image 1 sizeof(ptr) * list_style_position 2 - * list_style_type 4 + * list_style_type 6 * margin_bottom 2 + 5 4 * margin_left 2 + 5 4 * margin_right 2 + 5 4 @@ -140,66 +140,66 @@ struct css_computed_style_i { * quotes 1 sizeof(ptr) * * --- --- --- - * 460 bits 228 + 8sizeof(ptr) bytes + * 462 bits 228 + 8sizeof(ptr) bytes * =================== * 286 + 8sizeof(ptr) bytes * * Bit allocations: * - * 0 ccccccccoooooooobbbbbbbbrrrrrrrr - * column_rule_width; outline_width; border_left_width; border_bottom_width + * 0 bbbbbbbboooooooorrrrrrrrdddddddd + * border_left_width; border_top_width; border_bottom_width; border_right_width * - * 1 vvvvvvvvvbbbbbbbboooooooolllllll - * vertical_align; border_top_width; border_right_width; letter_spacing + * 1 vvvvvvvvvooooooooccccccccmmmmmmm + * vertical_align; outline_width; column_rule_width; margin_top * * 2 ccccccccccccccccccccccccccpppppp - * clip; padding_top + * clip; padding_left * - * 3 mmmmmmmaaaaaaarrrrrrrttttttddddd - * max_width; margin_bottom; margin_left; text_indent; display + * 3 mmmmmmmrrrrrrrwwwwwwwttttttddddd + * max_height; right; width; text_indent; display * - * 4 wwwwwwwfffffffcccccccllllllloooo - * word_spacing; flex_basis; column_gap; left; font_weight + * 4 fffffffmmmmmmmcccccccllllllltttt + * flex_basis; min_height; column_gap; left; text_align * - * 5 wwwwwwwhhhhhhhlllllllcccccccoooo - * width; height; line_height; column_width; outline_style + * 5 cccccccmmmmmmmlllllllwwwwwwwbbbb + * column_width; margin_bottom; line_height; word_spacing; break_inside * - * 6 tttttttmmmmmmmiiiiiiiaaaaaaabbbb - * top; max_height; min_width; margin_right; border_top_style + * 6 hhhhhhhlllllllmmmmmmmaaaaaaabbbb + * height; letter_spacing; min_width; margin_right; border_bottom_style * - * 7 rrrrrrrbbbbbbbmmmmmmmaaaaaaacccc - * right; bottom; min_height; margin_top; column_rule_style + * 7 tttttttmmmmmmmbbbbbbbaaaaaaaoooo + * top; margin_left; bottom; max_width; border_top_style * - * 8 ppppppaaaaaaddddddtttttcccccbbbb - * padding_left; padding_right; padding_bottom; text_decoration; cursor; - * border_right_style + * 8 llllllppppppaaaaaaddddddtttttggg + * list_style_type; padding_top; padding_right; padding_bottom; + * text_decoration; page_break_after * - * 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 + * 9 cccccbbbbooooffffrrrruuuullllnnn + * cursor; break_before; border_left_style; font_weight; break_after; + * outline_style; column_rule_style; font_family * - * 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 + * 10 aaallliiipppbbccttoouuzzffeerrmm + * align_content; align_items; align_self; position; border_bottom_color; + * column_rule_color; table_layout; box_sizing; column_span; z_index; + * flex_wrap; empty_cells; border_left_color; column_count * - * 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 + * 11 ffoobbppaannccrrddeeuulliittUUvv + * float; font_variant; background_attachment; page_break_inside; + * background_color; font_style; content; border_top_color; border_collapse; + * border_right_color; outline_color; column_fill; list_style_position; + * caption_side; unicode_bidi; visibility * - * 12 bbbbbbbbbbbaaaaaaaaaaafffffffffc - * border_spacing; background_position; font_size; color + * 12 bbbbbbbbbbbaaaaaaaaaaafffffffffl + * border_spacing; background_position; font_size; flex_grow * - * 13 bbbbrrrrllllttttooooddddeeeeaaai - * break_after; break_before; list_style_type; text_align; border_left_style; - * border_bottom_style; break_inside; background_repeat; list_style_image + * 13 bbbboooaaawwwvvvtttcccpppjjjfffr + * border_right_style; overflow_y; background_repeat; white_space; overflow_x; + * text_transform; clear; page_break_before; justify_content; flex_direction; + * order * - * 14 llcbqopwfrue.................... - * list_style_position; counter_increment; background_image; quotes; order; - * opacity; widows; flex_grow; orphans; counter_reset; flex_shrink + * 14 wwddlicobfqupr.................. + * writing_mode; direction; list_style_image; widows; counter_reset; orphans; + * background_image; flex_shrink; quotes; counter_increment; opacity; color */ uint32_t bits[15]; diff --git a/src/select/autogenerated_propget.h b/src/select/autogenerated_propget.h index f1b6092..39ce62a 100644 --- a/src/select/autogenerated_propget.h +++ b/src/select/autogenerated_propget.h @@ -6,9 +6,9 @@ */ -#define ALIGN_CONTENT_INDEX 9 -#define ALIGN_CONTENT_SHIFT 17 -#define ALIGN_CONTENT_MASK 0xe0000 +#define ALIGN_CONTENT_INDEX 10 +#define ALIGN_CONTENT_SHIFT 29 +#define ALIGN_CONTENT_MASK 0xe0000000 static inline uint8_t get_align_content(const css_computed_style *style) { uint32_t bits = style->i.bits[ALIGN_CONTENT_INDEX]; @@ -23,9 +23,9 @@ static inline uint8_t get_align_content(const css_computed_style *style) #undef ALIGN_CONTENT_SHIFT #undef ALIGN_CONTENT_MASK -#define ALIGN_ITEMS_INDEX 9 -#define ALIGN_ITEMS_SHIFT 29 -#define ALIGN_ITEMS_MASK 0xe0000000 +#define ALIGN_ITEMS_INDEX 10 +#define ALIGN_ITEMS_SHIFT 26 +#define ALIGN_ITEMS_MASK 0x1c000000 static inline uint8_t get_align_items(const css_computed_style *style) { uint32_t bits = style->i.bits[ALIGN_ITEMS_INDEX]; @@ -40,9 +40,9 @@ static inline uint8_t get_align_items(const css_computed_style *style) #undef ALIGN_ITEMS_SHIFT #undef ALIGN_ITEMS_MASK -#define ALIGN_SELF_INDEX 9 -#define ALIGN_SELF_SHIFT 20 -#define ALIGN_SELF_MASK 0x700000 +#define ALIGN_SELF_INDEX 10 +#define ALIGN_SELF_SHIFT 23 +#define ALIGN_SELF_MASK 0x3800000 static inline uint8_t get_align_self(const css_computed_style *style) { uint32_t bits = style->i.bits[ALIGN_SELF_INDEX]; @@ -57,9 +57,9 @@ static inline uint8_t get_align_self(const css_computed_style *style) #undef ALIGN_SELF_SHIFT #undef ALIGN_SELF_MASK -#define BACKGROUND_ATTACHMENT_INDEX 10 -#define BACKGROUND_ATTACHMENT_SHIFT 8 -#define BACKGROUND_ATTACHMENT_MASK 0x300 +#define BACKGROUND_ATTACHMENT_INDEX 11 +#define BACKGROUND_ATTACHMENT_SHIFT 26 +#define BACKGROUND_ATTACHMENT_MASK 0xc000000 static inline uint8_t get_background_attachment(const css_computed_style *style) { uint32_t bits = style->i.bits[BACKGROUND_ATTACHMENT_INDEX]; @@ -74,9 +74,9 @@ static inline uint8_t get_background_attachment(const css_computed_style *style) #undef BACKGROUND_ATTACHMENT_SHIFT #undef BACKGROUND_ATTACHMENT_MASK -#define BACKGROUND_COLOR_INDEX 10 -#define BACKGROUND_COLOR_SHIFT 2 -#define BACKGROUND_COLOR_MASK 0xc +#define BACKGROUND_COLOR_INDEX 11 +#define BACKGROUND_COLOR_SHIFT 22 +#define BACKGROUND_COLOR_MASK 0xc00000 static inline uint8_t get_background_color(const css_computed_style *style, css_color *color) { @@ -94,8 +94,8 @@ static inline uint8_t get_background_color(const css_computed_style *style, #undef BACKGROUND_COLOR_MASK #define BACKGROUND_IMAGE_INDEX 14 -#define BACKGROUND_IMAGE_SHIFT 28 -#define BACKGROUND_IMAGE_MASK 0x10000000 +#define BACKGROUND_IMAGE_SHIFT 23 +#define BACKGROUND_IMAGE_MASK 0x800000 static inline uint8_t get_background_image(const css_computed_style *style, lwc_string **string) { @@ -138,8 +138,8 @@ static inline uint8_t get_background_position(const css_computed_style *style, #undef BACKGROUND_POSITION_MASK #define BACKGROUND_REPEAT_INDEX 13 -#define BACKGROUND_REPEAT_SHIFT 1 -#define BACKGROUND_REPEAT_MASK 0xe +#define BACKGROUND_REPEAT_SHIFT 22 +#define BACKGROUND_REPEAT_MASK 0x1c00000 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 11 -#define BORDER_BOTTOM_COLOR_SHIFT 28 -#define BORDER_BOTTOM_COLOR_MASK 0x30000000 +#define BORDER_BOTTOM_COLOR_INDEX 10 +#define BORDER_BOTTOM_COLOR_SHIFT 18 +#define BORDER_BOTTOM_COLOR_MASK 0xc0000 static inline uint8_t get_border_bottom_color(const css_computed_style *style, css_color *color) { @@ -173,9 +173,9 @@ static inline uint8_t get_border_bottom_color(const css_computed_style *style, #undef BORDER_BOTTOM_COLOR_SHIFT #undef BORDER_BOTTOM_COLOR_MASK -#define BORDER_BOTTOM_STYLE_INDEX 13 -#define BORDER_BOTTOM_STYLE_SHIFT 8 -#define BORDER_BOTTOM_STYLE_MASK 0xf00 +#define BORDER_BOTTOM_STYLE_INDEX 6 +#define BORDER_BOTTOM_STYLE_SHIFT 0 +#define BORDER_BOTTOM_STYLE_MASK 0xf static inline uint8_t get_border_bottom_style(const css_computed_style *style) { uint32_t bits = style->i.bits[BORDER_BOTTOM_STYLE_INDEX]; @@ -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 0 -#define BORDER_BOTTOM_WIDTH_MASK 0xff +#define BORDER_BOTTOM_WIDTH_SHIFT 8 +#define BORDER_BOTTOM_WIDTH_MASK 0xff00 static inline uint8_t get_border_bottom_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -213,8 +213,8 @@ static inline uint8_t get_border_bottom_width(const css_computed_style *style, #undef BORDER_BOTTOM_WIDTH_MASK #define BORDER_COLLAPSE_INDEX 11 -#define BORDER_COLLAPSE_SHIFT 16 -#define BORDER_COLLAPSE_MASK 0x30000 +#define BORDER_COLLAPSE_SHIFT 14 +#define BORDER_COLLAPSE_MASK 0xc000 static inline uint8_t get_border_collapse(const css_computed_style *style) { uint32_t bits = style->i.bits[BORDER_COLLAPSE_INDEX]; @@ -230,8 +230,8 @@ static inline uint8_t get_border_collapse(const css_computed_style *style) #undef BORDER_COLLAPSE_MASK #define BORDER_LEFT_COLOR_INDEX 10 -#define BORDER_LEFT_COLOR_SHIFT 0 -#define BORDER_LEFT_COLOR_MASK 0x3 +#define BORDER_LEFT_COLOR_SHIFT 2 +#define BORDER_LEFT_COLOR_MASK 0xc static inline uint8_t get_border_left_color(const css_computed_style *style, css_color *color) { @@ -248,9 +248,9 @@ static inline uint8_t get_border_left_color(const css_computed_style *style, #undef BORDER_LEFT_COLOR_SHIFT #undef BORDER_LEFT_COLOR_MASK -#define BORDER_LEFT_STYLE_INDEX 13 -#define BORDER_LEFT_STYLE_SHIFT 12 -#define BORDER_LEFT_STYLE_MASK 0xf000 +#define BORDER_LEFT_STYLE_INDEX 9 +#define BORDER_LEFT_STYLE_SHIFT 19 +#define BORDER_LEFT_STYLE_MASK 0x780000 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 8 -#define BORDER_LEFT_WIDTH_MASK 0xff00 +#define BORDER_LEFT_WIDTH_SHIFT 24 +#define BORDER_LEFT_WIDTH_MASK 0xff000000 static inline uint8_t get_border_left_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -288,8 +288,8 @@ static inline uint8_t get_border_left_width(const css_computed_style *style, #undef BORDER_LEFT_WIDTH_MASK #define BORDER_RIGHT_COLOR_INDEX 11 -#define BORDER_RIGHT_COLOR_SHIFT 8 -#define BORDER_RIGHT_COLOR_MASK 0x300 +#define BORDER_RIGHT_COLOR_SHIFT 12 +#define BORDER_RIGHT_COLOR_MASK 0x3000 static inline uint8_t get_border_right_color(const css_computed_style *style, css_color *color) { @@ -306,9 +306,9 @@ 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 8 -#define BORDER_RIGHT_STYLE_SHIFT 0 -#define BORDER_RIGHT_STYLE_MASK 0xf +#define BORDER_RIGHT_STYLE_INDEX 13 +#define BORDER_RIGHT_STYLE_SHIFT 28 +#define BORDER_RIGHT_STYLE_MASK 0xf0000000 static inline uint8_t get_border_right_style(const css_computed_style *style) { uint32_t bits = style->i.bits[BORDER_RIGHT_STYLE_INDEX]; @@ -323,9 +323,9 @@ static inline uint8_t get_border_right_style(const css_computed_style *style) #undef BORDER_RIGHT_STYLE_SHIFT #undef BORDER_RIGHT_STYLE_MASK -#define BORDER_RIGHT_WIDTH_INDEX 1 -#define BORDER_RIGHT_WIDTH_SHIFT 7 -#define BORDER_RIGHT_WIDTH_MASK 0x7f80 +#define BORDER_RIGHT_WIDTH_INDEX 0 +#define BORDER_RIGHT_WIDTH_SHIFT 0 +#define BORDER_RIGHT_WIDTH_MASK 0xff static inline uint8_t get_border_right_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -371,8 +371,8 @@ static inline uint8_t get_border_spacing(const css_computed_style *style, #undef BORDER_SPACING_MASK #define BORDER_TOP_COLOR_INDEX 11 -#define BORDER_TOP_COLOR_SHIFT 26 -#define BORDER_TOP_COLOR_MASK 0xc000000 +#define BORDER_TOP_COLOR_SHIFT 16 +#define BORDER_TOP_COLOR_MASK 0x30000 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 6 +#define BORDER_TOP_STYLE_INDEX 7 #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 1 -#define BORDER_TOP_WIDTH_SHIFT 15 -#define BORDER_TOP_WIDTH_MASK 0x7f8000 +#define BORDER_TOP_WIDTH_INDEX 0 +#define BORDER_TOP_WIDTH_SHIFT 16 +#define BORDER_TOP_WIDTH_MASK 0xff0000 static inline uint8_t get_border_top_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -429,8 +429,8 @@ static inline uint8_t get_border_top_width(const css_computed_style *style, #undef BORDER_TOP_WIDTH_MASK #define BOTTOM_INDEX 7 -#define BOTTOM_SHIFT 18 -#define BOTTOM_MASK 0x1fc0000 +#define BOTTOM_SHIFT 11 +#define BOTTOM_MASK 0x3f800 static inline uint8_t get_bottom( const css_computed_style *style, css_fixed *length, css_unit *unit) @@ -462,8 +462,8 @@ static inline uint8_t get_bottom_bits( #undef BOTTOM_MASK #define BOX_SIZING_INDEX 10 -#define BOX_SIZING_SHIFT 18 -#define BOX_SIZING_MASK 0xc0000 +#define BOX_SIZING_SHIFT 12 +#define BOX_SIZING_MASK 0x3000 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 13 -#define BREAK_AFTER_SHIFT 28 -#define BREAK_AFTER_MASK 0xf0000000 +#define BREAK_AFTER_INDEX 9 +#define BREAK_AFTER_SHIFT 11 +#define BREAK_AFTER_MASK 0x7800 static inline uint8_t get_break_after(const css_computed_style *style) { uint32_t bits = style->i.bits[BREAK_AFTER_INDEX]; @@ -495,9 +495,9 @@ static inline uint8_t get_break_after(const css_computed_style *style) #undef BREAK_AFTER_SHIFT #undef BREAK_AFTER_MASK -#define BREAK_BEFORE_INDEX 13 -#define BREAK_BEFORE_SHIFT 24 -#define BREAK_BEFORE_MASK 0xf000000 +#define BREAK_BEFORE_INDEX 9 +#define BREAK_BEFORE_SHIFT 23 +#define BREAK_BEFORE_MASK 0x7800000 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 13 -#define BREAK_INSIDE_SHIFT 4 -#define BREAK_INSIDE_MASK 0xf0 +#define BREAK_INSIDE_INDEX 5 +#define BREAK_INSIDE_SHIFT 0 +#define BREAK_INSIDE_MASK 0xf 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 24 -#define CAPTION_SIDE_MASK 0x3000000 +#define CAPTION_SIDE_SHIFT 4 +#define CAPTION_SIDE_MASK 0x30 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 10 -#define CLEAR_SHIFT 23 -#define CLEAR_MASK 0x3800000 +#define CLEAR_INDEX 13 +#define CLEAR_SHIFT 10 +#define CLEAR_MASK 0x1c00 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 12 -#define COLOR_SHIFT 0 -#define COLOR_MASK 0x1 +#define COLOR_INDEX 14 +#define COLOR_SHIFT 18 +#define COLOR_MASK 0x40000 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 11 -#define COLUMN_COUNT_SHIFT 20 -#define COLUMN_COUNT_MASK 0x300000 +#define COLUMN_COUNT_INDEX 10 +#define COLUMN_COUNT_SHIFT 0 +#define COLUMN_COUNT_MASK 0x3 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 10 -#define COLUMN_FILL_MASK 0xc00 +#define COLUMN_FILL_SHIFT 8 +#define COLUMN_FILL_MASK 0x300 static inline uint8_t get_column_fill(const css_computed_style *style) { uint32_t bits = style->i.bits[COLUMN_FILL_INDEX]; @@ -683,8 +683,8 @@ static inline uint8_t get_column_gap(const css_computed_style *style, css_fixed #undef COLUMN_GAP_MASK #define COLUMN_RULE_COLOR_INDEX 10 -#define COLUMN_RULE_COLOR_SHIFT 10 -#define COLUMN_RULE_COLOR_MASK 0xc00 +#define COLUMN_RULE_COLOR_SHIFT 16 +#define COLUMN_RULE_COLOR_MASK 0x30000 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 7 -#define COLUMN_RULE_STYLE_SHIFT 0 -#define COLUMN_RULE_STYLE_MASK 0xf +#define COLUMN_RULE_STYLE_INDEX 9 +#define COLUMN_RULE_STYLE_SHIFT 3 +#define COLUMN_RULE_STYLE_MASK 0x78 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 0 -#define COLUMN_RULE_WIDTH_SHIFT 24 -#define COLUMN_RULE_WIDTH_MASK 0xff000000 +#define COLUMN_RULE_WIDTH_INDEX 1 +#define COLUMN_RULE_WIDTH_SHIFT 7 +#define COLUMN_RULE_WIDTH_MASK 0x7f80 static inline uint8_t get_column_rule_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -741,8 +741,8 @@ static inline uint8_t get_column_rule_width(const css_computed_style *style, #undef COLUMN_RULE_WIDTH_MASK #define COLUMN_SPAN_INDEX 10 -#define COLUMN_SPAN_SHIFT 6 -#define COLUMN_SPAN_MASK 0xc0 +#define COLUMN_SPAN_SHIFT 10 +#define COLUMN_SPAN_MASK 0xc00 static inline uint8_t get_column_span(const css_computed_style *style) { uint32_t bits = style->i.bits[COLUMN_SPAN_INDEX]; @@ -758,8 +758,8 @@ static inline uint8_t get_column_span(const css_computed_style *style) #undef COLUMN_SPAN_MASK #define COLUMN_WIDTH_INDEX 5 -#define COLUMN_WIDTH_SHIFT 4 -#define COLUMN_WIDTH_MASK 0x7f0 +#define COLUMN_WIDTH_SHIFT 25 +#define COLUMN_WIDTH_MASK 0xfe000000 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 0 -#define CONTENT_MASK 0x3 +#define CONTENT_SHIFT 18 +#define CONTENT_MASK 0xc0000 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 29 -#define COUNTER_INCREMENT_MASK 0x20000000 +#define COUNTER_INCREMENT_SHIFT 20 +#define COUNTER_INCREMENT_MASK 0x100000 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 21 -#define COUNTER_RESET_MASK 0x200000 +#define COUNTER_RESET_SHIFT 25 +#define COUNTER_RESET_MASK 0x2000000 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 8 -#define CURSOR_SHIFT 4 -#define CURSOR_MASK 0x1f0 +#define CURSOR_INDEX 9 +#define CURSOR_SHIFT 27 +#define CURSOR_MASK 0xf8000000 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 10 -#define DIRECTION_SHIFT 16 -#define DIRECTION_MASK 0x30000 +#define DIRECTION_INDEX 14 +#define DIRECTION_SHIFT 28 +#define DIRECTION_MASK 0x30000000 static inline uint8_t get_direction(const css_computed_style *style) { uint32_t bits = style->i.bits[DIRECTION_INDEX]; @@ -892,8 +892,8 @@ static inline uint8_t get_display(const css_computed_style *style) #undef DISPLAY_MASK #define EMPTY_CELLS_INDEX 10 -#define EMPTY_CELLS_SHIFT 14 -#define EMPTY_CELLS_MASK 0xc000 +#define EMPTY_CELLS_SHIFT 4 +#define EMPTY_CELLS_MASK 0x30 static inline uint8_t get_empty_cells(const css_computed_style *style) { uint32_t bits = style->i.bits[EMPTY_CELLS_INDEX]; @@ -909,8 +909,8 @@ static inline uint8_t get_empty_cells(const css_computed_style *style) #undef EMPTY_CELLS_MASK #define FLEX_BASIS_INDEX 4 -#define FLEX_BASIS_SHIFT 18 -#define FLEX_BASIS_MASK 0x1fc0000 +#define FLEX_BASIS_SHIFT 25 +#define FLEX_BASIS_MASK 0xfe000000 static inline uint8_t get_flex_basis(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -930,9 +930,9 @@ static inline uint8_t get_flex_basis(const css_computed_style *style, css_fixed #undef FLEX_BASIS_SHIFT #undef FLEX_BASIS_MASK -#define FLEX_DIRECTION_INDEX 9 -#define FLEX_DIRECTION_SHIFT 5 -#define FLEX_DIRECTION_MASK 0xe0 +#define FLEX_DIRECTION_INDEX 13 +#define FLEX_DIRECTION_SHIFT 1 +#define FLEX_DIRECTION_MASK 0xe static inline uint8_t get_flex_direction(const css_computed_style *style) { uint32_t bits = style->i.bits[FLEX_DIRECTION_INDEX]; @@ -947,9 +947,9 @@ static inline uint8_t get_flex_direction(const css_computed_style *style) #undef FLEX_DIRECTION_SHIFT #undef FLEX_DIRECTION_MASK -#define FLEX_GROW_INDEX 14 -#define FLEX_GROW_SHIFT 23 -#define FLEX_GROW_MASK 0x800000 +#define FLEX_GROW_INDEX 12 +#define FLEX_GROW_SHIFT 0 +#define FLEX_GROW_MASK 0x1 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 20 -#define FLEX_SHRINK_MASK 0x100000 +#define FLEX_SHRINK_SHIFT 22 +#define FLEX_SHRINK_MASK 0x400000 static inline uint8_t get_flex_shrink(const css_computed_style *style, css_fixed *fixed) { @@ -990,8 +990,8 @@ static inline uint8_t get_flex_shrink(const css_computed_style *style, #undef FLEX_SHRINK_MASK #define FLEX_WRAP_INDEX 10 -#define FLEX_WRAP_SHIFT 12 -#define FLEX_WRAP_MASK 0x3000 +#define FLEX_WRAP_SHIFT 6 +#define FLEX_WRAP_MASK 0xc0 static inline uint8_t get_flex_wrap(const css_computed_style *style) { uint32_t bits = style->i.bits[FLEX_WRAP_INDEX]; @@ -1007,8 +1007,8 @@ static inline uint8_t get_flex_wrap(const css_computed_style *style) #undef FLEX_WRAP_MASK #define FLOAT_INDEX 11 -#define FLOAT_SHIFT 6 -#define FLOAT_MASK 0xc0 +#define FLOAT_SHIFT 30 +#define FLOAT_MASK 0xc0000000 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 26 -#define FONT_FAMILY_MASK 0x1c000000 +#define FONT_FAMILY_SHIFT 0 +#define FONT_FAMILY_MASK 0x7 static inline uint8_t get_font_family(const css_computed_style *style, lwc_string ***string_arr) { @@ -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 30 -#define FONT_STYLE_MASK 0xc0000000 +#define FONT_STYLE_SHIFT 20 +#define FONT_STYLE_MASK 0x300000 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 22 -#define FONT_VARIANT_MASK 0xc00000 +#define FONT_VARIANT_SHIFT 28 +#define FONT_VARIANT_MASK 0x30000000 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 4 -#define FONT_WEIGHT_SHIFT 0 -#define FONT_WEIGHT_MASK 0xf +#define FONT_WEIGHT_INDEX 9 +#define FONT_WEIGHT_SHIFT 15 +#define FONT_WEIGHT_MASK 0x78000 static inline uint8_t get_font_weight(const css_computed_style *style) { uint32_t bits = style->i.bits[FONT_WEIGHT_INDEX]; @@ -1115,9 +1115,9 @@ static inline uint8_t get_font_weight(const css_computed_style *style) #undef FONT_WEIGHT_SHIFT #undef FONT_WEIGHT_MASK -#define HEIGHT_INDEX 5 -#define HEIGHT_SHIFT 18 -#define HEIGHT_MASK 0x1fc0000 +#define HEIGHT_INDEX 6 +#define HEIGHT_SHIFT 25 +#define HEIGHT_MASK 0xfe000000 static inline uint8_t get_height(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -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 10 -#define JUSTIFY_CONTENT_SHIFT 29 -#define JUSTIFY_CONTENT_MASK 0xe0000000 +#define JUSTIFY_CONTENT_INDEX 13 +#define JUSTIFY_CONTENT_SHIFT 4 +#define JUSTIFY_CONTENT_MASK 0x70 static inline uint8_t get_justify_content(const css_computed_style *style) { uint32_t bits = style->i.bits[JUSTIFY_CONTENT_INDEX]; @@ -1187,9 +1187,9 @@ static inline uint8_t get_left_bits( #undef LEFT_SHIFT #undef LEFT_MASK -#define LETTER_SPACING_INDEX 1 -#define LETTER_SPACING_SHIFT 0 -#define LETTER_SPACING_MASK 0x7f +#define LETTER_SPACING_INDEX 6 +#define LETTER_SPACING_SHIFT 18 +#define LETTER_SPACING_MASK 0x1fc0000 static inline uint8_t get_letter_spacing(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 13 -#define LIST_STYLE_IMAGE_SHIFT 0 -#define LIST_STYLE_IMAGE_MASK 0x1 +#define LIST_STYLE_IMAGE_INDEX 14 +#define LIST_STYLE_IMAGE_SHIFT 27 +#define LIST_STYLE_IMAGE_MASK 0x8000000 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 14 -#define LIST_STYLE_POSITION_SHIFT 30 -#define LIST_STYLE_POSITION_MASK 0xc0000000 +#define LIST_STYLE_POSITION_INDEX 11 +#define LIST_STYLE_POSITION_SHIFT 6 +#define LIST_STYLE_POSITION_MASK 0xc0 static inline uint8_t get_list_style_position(const css_computed_style *style) { uint32_t bits = style->i.bits[LIST_STYLE_POSITION_INDEX]; @@ -1272,24 +1272,24 @@ 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 13 -#define LIST_STYLE_TYPE_SHIFT 20 -#define LIST_STYLE_TYPE_MASK 0xf00000 +#define LIST_STYLE_TYPE_INDEX 8 +#define LIST_STYLE_TYPE_SHIFT 26 +#define LIST_STYLE_TYPE_MASK 0xfc000000 static inline uint8_t get_list_style_type(const css_computed_style *style) { uint32_t bits = style->i.bits[LIST_STYLE_TYPE_INDEX]; bits &= LIST_STYLE_TYPE_MASK; bits >>= LIST_STYLE_TYPE_SHIFT; - /* 4bits: tttt : type */ + /* 6bits: tttttt : type */ - return (bits & 0xf); + return (bits & 0x3f); } #undef LIST_STYLE_TYPE_INDEX #undef LIST_STYLE_TYPE_SHIFT #undef LIST_STYLE_TYPE_MASK -#define MARGIN_BOTTOM_INDEX 3 +#define MARGIN_BOTTOM_INDEX 5 #define MARGIN_BOTTOM_SHIFT 18 #define MARGIN_BOTTOM_MASK 0x1fc0000 static inline uint8_t get_margin_bottom(const css_computed_style *style, @@ -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 3 -#define MARGIN_LEFT_SHIFT 11 -#define MARGIN_LEFT_MASK 0x3f800 +#define MARGIN_LEFT_INDEX 7 +#define MARGIN_LEFT_SHIFT 18 +#define MARGIN_LEFT_MASK 0x1fc0000 static inline uint8_t get_margin_left(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -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 7 -#define MARGIN_TOP_SHIFT 4 -#define MARGIN_TOP_MASK 0x7f0 +#define MARGIN_TOP_INDEX 1 +#define MARGIN_TOP_SHIFT 0 +#define MARGIN_TOP_MASK 0x7f 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 6 -#define MAX_HEIGHT_SHIFT 18 -#define MAX_HEIGHT_MASK 0x1fc0000 +#define MAX_HEIGHT_INDEX 3 +#define MAX_HEIGHT_SHIFT 25 +#define MAX_HEIGHT_MASK 0xfe000000 static inline uint8_t get_max_height(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1399,9 +1399,9 @@ 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 3 -#define MAX_WIDTH_SHIFT 25 -#define MAX_WIDTH_MASK 0xfe000000 +#define MAX_WIDTH_INDEX 7 +#define MAX_WIDTH_SHIFT 4 +#define MAX_WIDTH_MASK 0x7f0 static inline uint8_t get_max_width(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -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 7 -#define MIN_HEIGHT_SHIFT 11 -#define MIN_HEIGHT_MASK 0x3f800 +#define MIN_HEIGHT_INDEX 4 +#define MIN_HEIGHT_SHIFT 18 +#define MIN_HEIGHT_MASK 0x1fc0000 static inline uint8_t get_min_height(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 25 -#define OPACITY_MASK 0x2000000 +#define OPACITY_SHIFT 19 +#define OPACITY_MASK 0x80000 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 14 -#define ORDER_SHIFT 26 -#define ORDER_MASK 0x4000000 +#define ORDER_INDEX 13 +#define ORDER_SHIFT 0 +#define ORDER_MASK 0x1 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 22 -#define ORPHANS_MASK 0x400000 +#define ORPHANS_SHIFT 24 +#define ORPHANS_MASK 0x1000000 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 12 -#define OUTLINE_COLOR_MASK 0x3000 +#define OUTLINE_COLOR_SHIFT 10 +#define OUTLINE_COLOR_MASK 0xc00 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 5 -#define OUTLINE_STYLE_SHIFT 0 -#define OUTLINE_STYLE_MASK 0xf +#define OUTLINE_STYLE_INDEX 9 +#define OUTLINE_STYLE_SHIFT 7 +#define OUTLINE_STYLE_MASK 0x780 static inline uint8_t get_outline_style(const css_computed_style *style) { uint32_t bits = style->i.bits[OUTLINE_STYLE_INDEX]; @@ -1564,9 +1564,9 @@ static inline uint8_t get_outline_style(const css_computed_style *style) #undef OUTLINE_STYLE_SHIFT #undef OUTLINE_STYLE_MASK -#define OUTLINE_WIDTH_INDEX 0 -#define OUTLINE_WIDTH_SHIFT 16 -#define OUTLINE_WIDTH_MASK 0xff0000 +#define OUTLINE_WIDTH_INDEX 1 +#define OUTLINE_WIDTH_SHIFT 15 +#define OUTLINE_WIDTH_MASK 0x7f8000 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 9 -#define OVERFLOW_X_SHIFT 14 -#define OVERFLOW_X_MASK 0x1c000 +#define OVERFLOW_X_INDEX 13 +#define OVERFLOW_X_SHIFT 16 +#define OVERFLOW_X_MASK 0x70000 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 9 -#define OVERFLOW_Y_SHIFT 11 -#define OVERFLOW_Y_MASK 0x3800 +#define OVERFLOW_Y_INDEX 13 +#define OVERFLOW_Y_SHIFT 25 +#define OVERFLOW_Y_MASK 0xe000000 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 14 -#define PADDING_BOTTOM_MASK 0xfc000 +#define PADDING_BOTTOM_SHIFT 8 +#define PADDING_BOTTOM_MASK 0x3f00 static inline uint8_t get_padding_bottom(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1642,9 +1642,9 @@ static inline uint8_t get_padding_bottom(const css_computed_style *style, #undef PADDING_BOTTOM_SHIFT #undef PADDING_BOTTOM_MASK -#define PADDING_LEFT_INDEX 8 -#define PADDING_LEFT_SHIFT 26 -#define PADDING_LEFT_MASK 0xfc000000 +#define PADDING_LEFT_INDEX 2 +#define PADDING_LEFT_SHIFT 0 +#define PADDING_LEFT_MASK 0x3f static inline uint8_t get_padding_left(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1665,8 +1665,8 @@ static inline uint8_t get_padding_left(const css_computed_style *style, #undef PADDING_LEFT_MASK #define PADDING_RIGHT_INDEX 8 -#define PADDING_RIGHT_SHIFT 20 -#define PADDING_RIGHT_MASK 0x3f00000 +#define PADDING_RIGHT_SHIFT 14 +#define PADDING_RIGHT_MASK 0xfc000 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 2 -#define PADDING_TOP_SHIFT 0 -#define PADDING_TOP_MASK 0x3f +#define PADDING_TOP_INDEX 8 +#define PADDING_TOP_SHIFT 20 +#define PADDING_TOP_MASK 0x3f00000 static inline uint8_t get_padding_top(const css_computed_style *style, css_fixed *length, css_unit *unit) { @@ -1708,9 +1708,9 @@ static inline uint8_t get_padding_top(const css_computed_style *style, #undef PADDING_TOP_SHIFT #undef PADDING_TOP_MASK -#define PAGE_BREAK_AFTER_INDEX 9 -#define PAGE_BREAK_AFTER_SHIFT 2 -#define PAGE_BREAK_AFTER_MASK 0x1c +#define PAGE_BREAK_AFTER_INDEX 8 +#define PAGE_BREAK_AFTER_SHIFT 0 +#define PAGE_BREAK_AFTER_MASK 0x7 static inline uint8_t get_page_break_after(const css_computed_style *style) { uint32_t bits = style->i.bits[PAGE_BREAK_AFTER_INDEX]; @@ -1725,9 +1725,9 @@ static inline uint8_t get_page_break_after(const css_computed_style *style) #undef PAGE_BREAK_AFTER_SHIFT #undef PAGE_BREAK_AFTER_MASK -#define PAGE_BREAK_BEFORE_INDEX 9 -#define PAGE_BREAK_BEFORE_SHIFT 23 -#define PAGE_BREAK_BEFORE_MASK 0x3800000 +#define PAGE_BREAK_BEFORE_INDEX 13 +#define PAGE_BREAK_BEFORE_SHIFT 7 +#define PAGE_BREAK_BEFORE_MASK 0x380 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 10 -#define PAGE_BREAK_INSIDE_SHIFT 4 -#define PAGE_BREAK_INSIDE_MASK 0x30 +#define PAGE_BREAK_INSIDE_INDEX 11 +#define PAGE_BREAK_INSIDE_SHIFT 24 +#define PAGE_BREAK_INSIDE_MASK 0x3000000 static inline uint8_t get_page_break_inside(const css_computed_style *style) { uint32_t bits = style->i.bits[PAGE_BREAK_INSIDE_INDEX]; @@ -1760,8 +1760,8 @@ static inline uint8_t get_page_break_inside(const css_computed_style *style) #undef PAGE_BREAK_INSIDE_MASK #define POSITION_INDEX 10 -#define POSITION_SHIFT 26 -#define POSITION_MASK 0x1c000000 +#define POSITION_SHIFT 20 +#define POSITION_MASK 0x700000 static inline uint8_t get_position(const css_computed_style *style) { uint32_t bits = style->i.bits[POSITION_INDEX]; @@ -1777,8 +1777,8 @@ static inline uint8_t get_position(const css_computed_style *style) #undef POSITION_MASK #define QUOTES_INDEX 14 -#define QUOTES_SHIFT 27 -#define QUOTES_MASK 0x8000000 +#define QUOTES_SHIFT 21 +#define QUOTES_MASK 0x200000 static inline uint8_t get_quotes(const css_computed_style *style, lwc_string ***string_arr) { @@ -1795,9 +1795,9 @@ static inline uint8_t get_quotes(const css_computed_style *style, lwc_string #undef QUOTES_SHIFT #undef QUOTES_MASK -#define RIGHT_INDEX 7 -#define RIGHT_SHIFT 25 -#define RIGHT_MASK 0xfe000000 +#define RIGHT_INDEX 3 +#define RIGHT_SHIFT 18 +#define RIGHT_MASK 0x1fc0000 static inline uint8_t get_right( const css_computed_style *style, css_fixed *length, css_unit *unit) @@ -1828,9 +1828,9 @@ static inline uint8_t get_right_bits( #undef RIGHT_SHIFT #undef RIGHT_MASK -#define TABLE_LAYOUT_INDEX 11 -#define TABLE_LAYOUT_SHIFT 4 -#define TABLE_LAYOUT_MASK 0x30 +#define TABLE_LAYOUT_INDEX 10 +#define TABLE_LAYOUT_SHIFT 14 +#define TABLE_LAYOUT_MASK 0xc000 static inline uint8_t get_table_layout(const css_computed_style *style) { uint32_t bits = style->i.bits[TABLE_LAYOUT_INDEX]; @@ -1845,9 +1845,9 @@ static inline uint8_t get_table_layout(const css_computed_style *style) #undef TABLE_LAYOUT_SHIFT #undef TABLE_LAYOUT_MASK -#define TEXT_ALIGN_INDEX 13 -#define TEXT_ALIGN_SHIFT 16 -#define TEXT_ALIGN_MASK 0xf0000 +#define TEXT_ALIGN_INDEX 4 +#define TEXT_ALIGN_SHIFT 0 +#define TEXT_ALIGN_MASK 0xf 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 9 -#define TEXT_DECORATION_MASK 0x3e00 +#define TEXT_DECORATION_SHIFT 3 +#define TEXT_DECORATION_MASK 0xf8 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 9 -#define TEXT_TRANSFORM_SHIFT 8 -#define TEXT_TRANSFORM_MASK 0x700 +#define TEXT_TRANSFORM_INDEX 13 +#define TEXT_TRANSFORM_SHIFT 13 +#define TEXT_TRANSFORM_MASK 0xe000 static inline uint8_t get_text_transform(const css_computed_style *style) { uint32_t bits = style->i.bits[TEXT_TRANSFORM_INDEX]; @@ -1918,7 +1918,7 @@ static inline uint8_t get_text_transform(const css_computed_style *style) #undef TEXT_TRANSFORM_SHIFT #undef TEXT_TRANSFORM_MASK -#define TOP_INDEX 6 +#define TOP_INDEX 7 #define TOP_SHIFT 25 #define TOP_MASK 0xfe000000 static inline uint8_t get_top( @@ -1951,9 +1951,9 @@ static inline uint8_t get_top_bits( #undef TOP_SHIFT #undef TOP_MASK -#define UNICODE_BIDI_INDEX 9 -#define UNICODE_BIDI_SHIFT 0 -#define UNICODE_BIDI_MASK 0x3 +#define UNICODE_BIDI_INDEX 11 +#define UNICODE_BIDI_SHIFT 2 +#define UNICODE_BIDI_MASK 0xc static inline uint8_t get_unicode_bidi(const css_computed_style *style) { uint32_t bits = style->i.bits[UNICODE_BIDI_INDEX]; @@ -1991,8 +1991,8 @@ static inline uint8_t get_vertical_align(const css_computed_style *style, #undef VERTICAL_ALIGN_MASK #define VISIBILITY_INDEX 11 -#define VISIBILITY_SHIFT 14 -#define VISIBILITY_MASK 0xc000 +#define VISIBILITY_SHIFT 0 +#define VISIBILITY_MASK 0x3 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 10 -#define WHITE_SPACE_SHIFT 20 -#define WHITE_SPACE_MASK 0x700000 +#define WHITE_SPACE_INDEX 13 +#define WHITE_SPACE_SHIFT 19 +#define WHITE_SPACE_MASK 0x380000 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 24 -#define WIDOWS_MASK 0x1000000 +#define WIDOWS_SHIFT 26 +#define WIDOWS_MASK 0x4000000 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 5 -#define WIDTH_SHIFT 25 -#define WIDTH_MASK 0xfe000000 +#define WIDTH_INDEX 3 +#define WIDTH_SHIFT 11 +#define WIDTH_MASK 0x3f800 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 4 -#define WORD_SPACING_SHIFT 25 -#define WORD_SPACING_MASK 0xfe000000 +#define WORD_SPACING_INDEX 5 +#define WORD_SPACING_SHIFT 4 +#define WORD_SPACING_MASK 0x7f0 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 11 -#define WRITING_MODE_SHIFT 18 -#define WRITING_MODE_MASK 0xc0000 +#define WRITING_MODE_INDEX 14 +#define WRITING_MODE_SHIFT 30 +#define WRITING_MODE_MASK 0xc0000000 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 11 -#define Z_INDEX_SHIFT 2 -#define Z_INDEX_MASK 0xc +#define Z_INDEX_INDEX 10 +#define Z_INDEX_SHIFT 8 +#define Z_INDEX_MASK 0x300 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 2854896..56ff7c6 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 9 -#define ALIGN_CONTENT_SHIFT 17 -#define ALIGN_CONTENT_MASK 0xe0000 +#define ALIGN_CONTENT_INDEX 10 +#define ALIGN_CONTENT_SHIFT 29 +#define ALIGN_CONTENT_MASK 0xe0000000 static inline css_error set_align_content(css_computed_style *style, uint8_t type) @@ -29,9 +29,9 @@ static inline css_error set_align_content(css_computed_style *style, uint8_t #undef ALIGN_CONTENT_SHIFT #undef ALIGN_CONTENT_MASK -#define ALIGN_ITEMS_INDEX 9 -#define ALIGN_ITEMS_SHIFT 29 -#define ALIGN_ITEMS_MASK 0xe0000000 +#define ALIGN_ITEMS_INDEX 10 +#define ALIGN_ITEMS_SHIFT 26 +#define ALIGN_ITEMS_MASK 0x1c000000 static inline css_error set_align_items(css_computed_style *style, uint8_t type) { @@ -49,9 +49,9 @@ static inline css_error set_align_items(css_computed_style *style, uint8_t type) #undef ALIGN_ITEMS_SHIFT #undef ALIGN_ITEMS_MASK -#define ALIGN_SELF_INDEX 9 -#define ALIGN_SELF_SHIFT 20 -#define ALIGN_SELF_MASK 0x700000 +#define ALIGN_SELF_INDEX 10 +#define ALIGN_SELF_SHIFT 23 +#define ALIGN_SELF_MASK 0x3800000 static inline css_error set_align_self(css_computed_style *style, uint8_t type) { @@ -69,9 +69,9 @@ static inline css_error set_align_self(css_computed_style *style, uint8_t type) #undef ALIGN_SELF_SHIFT #undef ALIGN_SELF_MASK -#define BACKGROUND_ATTACHMENT_INDEX 10 -#define BACKGROUND_ATTACHMENT_SHIFT 8 -#define BACKGROUND_ATTACHMENT_MASK 0x300 +#define BACKGROUND_ATTACHMENT_INDEX 11 +#define BACKGROUND_ATTACHMENT_SHIFT 26 +#define BACKGROUND_ATTACHMENT_MASK 0xc000000 static inline css_error set_background_attachment(css_computed_style *style, uint8_t type) @@ -90,9 +90,9 @@ static inline css_error set_background_attachment(css_computed_style *style, #undef BACKGROUND_ATTACHMENT_SHIFT #undef BACKGROUND_ATTACHMENT_MASK -#define BACKGROUND_COLOR_INDEX 10 -#define BACKGROUND_COLOR_SHIFT 2 -#define BACKGROUND_COLOR_MASK 0xc +#define BACKGROUND_COLOR_INDEX 11 +#define BACKGROUND_COLOR_SHIFT 22 +#define BACKGROUND_COLOR_MASK 0xc00000 static inline css_error set_background_color(css_computed_style *style, uint8_t type, css_color color) @@ -114,8 +114,8 @@ static inline css_error set_background_color(css_computed_style *style, uint8_t #undef BACKGROUND_COLOR_MASK #define BACKGROUND_IMAGE_INDEX 14 -#define BACKGROUND_IMAGE_SHIFT 28 -#define BACKGROUND_IMAGE_MASK 0x10000000 +#define BACKGROUND_IMAGE_SHIFT 23 +#define BACKGROUND_IMAGE_MASK 0x800000 static inline css_error set_background_image(css_computed_style *style, uint8_t type, lwc_string *string) @@ -173,8 +173,8 @@ static inline css_error set_background_position(css_computed_style *style, #undef BACKGROUND_POSITION_MASK #define BACKGROUND_REPEAT_INDEX 13 -#define BACKGROUND_REPEAT_SHIFT 1 -#define BACKGROUND_REPEAT_MASK 0xe +#define BACKGROUND_REPEAT_SHIFT 22 +#define BACKGROUND_REPEAT_MASK 0x1c00000 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 11 -#define BORDER_BOTTOM_COLOR_SHIFT 28 -#define BORDER_BOTTOM_COLOR_MASK 0x30000000 +#define BORDER_BOTTOM_COLOR_INDEX 10 +#define BORDER_BOTTOM_COLOR_SHIFT 18 +#define BORDER_BOTTOM_COLOR_MASK 0xc0000 static inline css_error set_border_bottom_color(css_computed_style *style, uint8_t type, css_color color) @@ -216,9 +216,9 @@ static inline css_error set_border_bottom_color(css_computed_style *style, #undef BORDER_BOTTOM_COLOR_SHIFT #undef BORDER_BOTTOM_COLOR_MASK -#define BORDER_BOTTOM_STYLE_INDEX 13 -#define BORDER_BOTTOM_STYLE_SHIFT 8 -#define BORDER_BOTTOM_STYLE_MASK 0xf00 +#define BORDER_BOTTOM_STYLE_INDEX 6 +#define BORDER_BOTTOM_STYLE_SHIFT 0 +#define BORDER_BOTTOM_STYLE_MASK 0xf static inline css_error set_border_bottom_style(css_computed_style *style, uint8_t type) @@ -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 0 -#define BORDER_BOTTOM_WIDTH_MASK 0xff +#define BORDER_BOTTOM_WIDTH_SHIFT 8 +#define BORDER_BOTTOM_WIDTH_MASK 0xff00 static inline css_error set_border_bottom_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -261,8 +261,8 @@ static inline css_error set_border_bottom_width(css_computed_style *style, #undef BORDER_BOTTOM_WIDTH_MASK #define BORDER_COLLAPSE_INDEX 11 -#define BORDER_COLLAPSE_SHIFT 16 -#define BORDER_COLLAPSE_MASK 0x30000 +#define BORDER_COLLAPSE_SHIFT 14 +#define BORDER_COLLAPSE_MASK 0xc000 static inline css_error set_border_collapse(css_computed_style *style, uint8_t type) @@ -282,8 +282,8 @@ static inline css_error set_border_collapse(css_computed_style *style, uint8_t #undef BORDER_COLLAPSE_MASK #define BORDER_LEFT_COLOR_INDEX 10 -#define BORDER_LEFT_COLOR_SHIFT 0 -#define BORDER_LEFT_COLOR_MASK 0x3 +#define BORDER_LEFT_COLOR_SHIFT 2 +#define BORDER_LEFT_COLOR_MASK 0xc static inline css_error set_border_left_color(css_computed_style *style, uint8_t type, css_color color) @@ -304,9 +304,9 @@ static inline css_error set_border_left_color(css_computed_style *style, #undef BORDER_LEFT_COLOR_SHIFT #undef BORDER_LEFT_COLOR_MASK -#define BORDER_LEFT_STYLE_INDEX 13 -#define BORDER_LEFT_STYLE_SHIFT 12 -#define BORDER_LEFT_STYLE_MASK 0xf000 +#define BORDER_LEFT_STYLE_INDEX 9 +#define BORDER_LEFT_STYLE_SHIFT 19 +#define BORDER_LEFT_STYLE_MASK 0x780000 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 8 -#define BORDER_LEFT_WIDTH_MASK 0xff00 +#define BORDER_LEFT_WIDTH_SHIFT 24 +#define BORDER_LEFT_WIDTH_MASK 0xff000000 static inline css_error set_border_left_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -349,8 +349,8 @@ static inline css_error set_border_left_width(css_computed_style *style, #undef BORDER_LEFT_WIDTH_MASK #define BORDER_RIGHT_COLOR_INDEX 11 -#define BORDER_RIGHT_COLOR_SHIFT 8 -#define BORDER_RIGHT_COLOR_MASK 0x300 +#define BORDER_RIGHT_COLOR_SHIFT 12 +#define BORDER_RIGHT_COLOR_MASK 0x3000 static inline css_error set_border_right_color(css_computed_style *style, uint8_t type, css_color color) @@ -371,9 +371,9 @@ 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 8 -#define BORDER_RIGHT_STYLE_SHIFT 0 -#define BORDER_RIGHT_STYLE_MASK 0xf +#define BORDER_RIGHT_STYLE_INDEX 13 +#define BORDER_RIGHT_STYLE_SHIFT 28 +#define BORDER_RIGHT_STYLE_MASK 0xf0000000 static inline css_error set_border_right_style(css_computed_style *style, uint8_t type) @@ -392,9 +392,9 @@ static inline css_error set_border_right_style(css_computed_style *style, #undef BORDER_RIGHT_STYLE_SHIFT #undef BORDER_RIGHT_STYLE_MASK -#define BORDER_RIGHT_WIDTH_INDEX 1 -#define BORDER_RIGHT_WIDTH_SHIFT 7 -#define BORDER_RIGHT_WIDTH_MASK 0x7f80 +#define BORDER_RIGHT_WIDTH_INDEX 0 +#define BORDER_RIGHT_WIDTH_SHIFT 0 +#define BORDER_RIGHT_WIDTH_MASK 0xff static inline css_error set_border_right_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -442,8 +442,8 @@ static inline css_error set_border_spacing(css_computed_style *style, uint8_t #undef BORDER_SPACING_MASK #define BORDER_TOP_COLOR_INDEX 11 -#define BORDER_TOP_COLOR_SHIFT 26 -#define BORDER_TOP_COLOR_MASK 0xc000000 +#define BORDER_TOP_COLOR_SHIFT 16 +#define BORDER_TOP_COLOR_MASK 0x30000 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 6 +#define BORDER_TOP_STYLE_INDEX 7 #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 1 -#define BORDER_TOP_WIDTH_SHIFT 15 -#define BORDER_TOP_WIDTH_MASK 0x7f8000 +#define BORDER_TOP_WIDTH_INDEX 0 +#define BORDER_TOP_WIDTH_SHIFT 16 +#define BORDER_TOP_WIDTH_MASK 0xff0000 static inline css_error set_border_top_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -509,8 +509,8 @@ static inline css_error set_border_top_width(css_computed_style *style, uint8_t #undef BORDER_TOP_WIDTH_MASK #define BOTTOM_INDEX 7 -#define BOTTOM_SHIFT 18 -#define BOTTOM_MASK 0x1fc0000 +#define BOTTOM_SHIFT 11 +#define BOTTOM_MASK 0x3f800 static inline css_error set_bottom(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -532,8 +532,8 @@ static inline css_error set_bottom(css_computed_style *style, uint8_t type, #undef BOTTOM_MASK #define BOX_SIZING_INDEX 10 -#define BOX_SIZING_SHIFT 18 -#define BOX_SIZING_MASK 0xc0000 +#define BOX_SIZING_SHIFT 12 +#define BOX_SIZING_MASK 0x3000 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 13 -#define BREAK_AFTER_SHIFT 28 -#define BREAK_AFTER_MASK 0xf0000000 +#define BREAK_AFTER_INDEX 9 +#define BREAK_AFTER_SHIFT 11 +#define BREAK_AFTER_MASK 0x7800 static inline css_error set_break_after(css_computed_style *style, uint8_t type) { @@ -571,9 +571,9 @@ static inline css_error set_break_after(css_computed_style *style, uint8_t type) #undef BREAK_AFTER_SHIFT #undef BREAK_AFTER_MASK -#define BREAK_BEFORE_INDEX 13 -#define BREAK_BEFORE_SHIFT 24 -#define BREAK_BEFORE_MASK 0xf000000 +#define BREAK_BEFORE_INDEX 9 +#define BREAK_BEFORE_SHIFT 23 +#define BREAK_BEFORE_MASK 0x7800000 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 13 -#define BREAK_INSIDE_SHIFT 4 -#define BREAK_INSIDE_MASK 0xf0 +#define BREAK_INSIDE_INDEX 5 +#define BREAK_INSIDE_SHIFT 0 +#define BREAK_INSIDE_MASK 0xf 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 24 -#define CAPTION_SIDE_MASK 0x3000000 +#define CAPTION_SIDE_SHIFT 4 +#define CAPTION_SIDE_MASK 0x30 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 10 -#define CLEAR_SHIFT 23 -#define CLEAR_MASK 0x3800000 +#define CLEAR_INDEX 13 +#define CLEAR_SHIFT 10 +#define CLEAR_MASK 0x1c00 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 12 -#define COLOR_SHIFT 0 -#define COLOR_MASK 0x1 +#define COLOR_INDEX 14 +#define COLOR_SHIFT 18 +#define COLOR_MASK 0x40000 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 11 -#define COLUMN_COUNT_SHIFT 20 -#define COLUMN_COUNT_MASK 0x300000 +#define COLUMN_COUNT_INDEX 10 +#define COLUMN_COUNT_SHIFT 0 +#define COLUMN_COUNT_MASK 0x3 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 10 -#define COLUMN_FILL_MASK 0xc00 +#define COLUMN_FILL_SHIFT 8 +#define COLUMN_FILL_MASK 0x300 static inline css_error set_column_fill(css_computed_style *style, uint8_t type) { @@ -785,8 +785,8 @@ static inline css_error set_column_gap(css_computed_style *style, uint8_t type, #undef COLUMN_GAP_MASK #define COLUMN_RULE_COLOR_INDEX 10 -#define COLUMN_RULE_COLOR_SHIFT 10 -#define COLUMN_RULE_COLOR_MASK 0xc00 +#define COLUMN_RULE_COLOR_SHIFT 16 +#define COLUMN_RULE_COLOR_MASK 0x30000 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 7 -#define COLUMN_RULE_STYLE_SHIFT 0 -#define COLUMN_RULE_STYLE_MASK 0xf +#define COLUMN_RULE_STYLE_INDEX 9 +#define COLUMN_RULE_STYLE_SHIFT 3 +#define COLUMN_RULE_STYLE_MASK 0x78 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 0 -#define COLUMN_RULE_WIDTH_SHIFT 24 -#define COLUMN_RULE_WIDTH_MASK 0xff000000 +#define COLUMN_RULE_WIDTH_INDEX 1 +#define COLUMN_RULE_WIDTH_SHIFT 7 +#define COLUMN_RULE_WIDTH_MASK 0x7f80 static inline css_error set_column_rule_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -852,8 +852,8 @@ static inline css_error set_column_rule_width(css_computed_style *style, #undef COLUMN_RULE_WIDTH_MASK #define COLUMN_SPAN_INDEX 10 -#define COLUMN_SPAN_SHIFT 6 -#define COLUMN_SPAN_MASK 0xc0 +#define COLUMN_SPAN_SHIFT 10 +#define COLUMN_SPAN_MASK 0xc00 static inline css_error set_column_span(css_computed_style *style, uint8_t type) { @@ -872,8 +872,8 @@ static inline css_error set_column_span(css_computed_style *style, uint8_t type) #undef COLUMN_SPAN_MASK #define COLUMN_WIDTH_INDEX 5 -#define COLUMN_WIDTH_SHIFT 4 -#define COLUMN_WIDTH_MASK 0x7f0 +#define COLUMN_WIDTH_SHIFT 25 +#define COLUMN_WIDTH_MASK 0xfe000000 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 0 -#define CONTENT_MASK 0x3 +#define CONTENT_SHIFT 18 +#define CONTENT_MASK 0xc0000 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 29 -#define COUNTER_INCREMENT_MASK 0x20000000 +#define COUNTER_INCREMENT_SHIFT 20 +#define COUNTER_INCREMENT_MASK 0x100000 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 21 -#define COUNTER_RESET_MASK 0x200000 +#define COUNTER_RESET_SHIFT 25 +#define COUNTER_RESET_MASK 0x2000000 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 8 -#define CURSOR_SHIFT 4 -#define CURSOR_MASK 0x1f0 +#define CURSOR_INDEX 9 +#define CURSOR_SHIFT 27 +#define CURSOR_MASK 0xf8000000 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 10 -#define DIRECTION_SHIFT 16 -#define DIRECTION_MASK 0x30000 +#define DIRECTION_INDEX 14 +#define DIRECTION_SHIFT 28 +#define DIRECTION_MASK 0x30000000 static inline css_error set_direction(css_computed_style *style, uint8_t type) { @@ -1132,8 +1132,8 @@ static inline css_error set_display(css_computed_style *style, uint8_t type) #undef DISPLAY_MASK #define EMPTY_CELLS_INDEX 10 -#define EMPTY_CELLS_SHIFT 14 -#define EMPTY_CELLS_MASK 0xc000 +#define EMPTY_CELLS_SHIFT 4 +#define EMPTY_CELLS_MASK 0x30 static inline css_error set_empty_cells(css_computed_style *style, uint8_t type) { @@ -1152,8 +1152,8 @@ static inline css_error set_empty_cells(css_computed_style *style, uint8_t type) #undef EMPTY_CELLS_MASK #define FLEX_BASIS_INDEX 4 -#define FLEX_BASIS_SHIFT 18 -#define FLEX_BASIS_MASK 0x1fc0000 +#define FLEX_BASIS_SHIFT 25 +#define FLEX_BASIS_MASK 0xfe000000 static inline css_error set_flex_basis(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1174,9 +1174,9 @@ static inline css_error set_flex_basis(css_computed_style *style, uint8_t type, #undef FLEX_BASIS_SHIFT #undef FLEX_BASIS_MASK -#define FLEX_DIRECTION_INDEX 9 -#define FLEX_DIRECTION_SHIFT 5 -#define FLEX_DIRECTION_MASK 0xe0 +#define FLEX_DIRECTION_INDEX 13 +#define FLEX_DIRECTION_SHIFT 1 +#define FLEX_DIRECTION_MASK 0xe static inline css_error set_flex_direction(css_computed_style *style, uint8_t type) @@ -1195,9 +1195,9 @@ static inline css_error set_flex_direction(css_computed_style *style, uint8_t #undef FLEX_DIRECTION_SHIFT #undef FLEX_DIRECTION_MASK -#define FLEX_GROW_INDEX 14 -#define FLEX_GROW_SHIFT 23 -#define FLEX_GROW_MASK 0x800000 +#define FLEX_GROW_INDEX 12 +#define FLEX_GROW_SHIFT 0 +#define FLEX_GROW_MASK 0x1 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 20 -#define FLEX_SHRINK_MASK 0x100000 +#define FLEX_SHRINK_SHIFT 22 +#define FLEX_SHRINK_MASK 0x400000 static inline css_error set_flex_shrink(css_computed_style *style, uint8_t type, css_fixed fixed) @@ -1242,8 +1242,8 @@ static inline css_error set_flex_shrink(css_computed_style *style, uint8_t #undef FLEX_SHRINK_MASK #define FLEX_WRAP_INDEX 10 -#define FLEX_WRAP_SHIFT 12 -#define FLEX_WRAP_MASK 0x3000 +#define FLEX_WRAP_SHIFT 6 +#define FLEX_WRAP_MASK 0xc0 static inline css_error set_flex_wrap(css_computed_style *style, uint8_t type) { @@ -1262,8 +1262,8 @@ static inline css_error set_flex_wrap(css_computed_style *style, uint8_t type) #undef FLEX_WRAP_MASK #define FLOAT_INDEX 11 -#define FLOAT_SHIFT 6 -#define FLOAT_MASK 0xc0 +#define FLOAT_SHIFT 30 +#define FLOAT_MASK 0xc0000000 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 26 -#define FONT_FAMILY_MASK 0x1c000000 +#define FONT_FAMILY_SHIFT 0 +#define FONT_FAMILY_MASK 0x7 static inline css_error set_font_family(css_computed_style *style, uint8_t type, lwc_string **string_arr) @@ -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 30 -#define FONT_STYLE_MASK 0xc0000000 +#define FONT_STYLE_SHIFT 20 +#define FONT_STYLE_MASK 0x300000 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 22 -#define FONT_VARIANT_MASK 0xc00000 +#define FONT_VARIANT_SHIFT 28 +#define FONT_VARIANT_MASK 0x30000000 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 4 -#define FONT_WEIGHT_SHIFT 0 -#define FONT_WEIGHT_MASK 0xf +#define FONT_WEIGHT_INDEX 9 +#define FONT_WEIGHT_SHIFT 15 +#define FONT_WEIGHT_MASK 0x78000 static inline css_error set_font_weight(css_computed_style *style, uint8_t type) { @@ -1402,9 +1402,9 @@ 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 5 -#define HEIGHT_SHIFT 18 -#define HEIGHT_MASK 0x1fc0000 +#define HEIGHT_INDEX 6 +#define HEIGHT_SHIFT 25 +#define HEIGHT_MASK 0xfe000000 static inline css_error set_height(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -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 10 -#define JUSTIFY_CONTENT_SHIFT 29 -#define JUSTIFY_CONTENT_MASK 0xe0000000 +#define JUSTIFY_CONTENT_INDEX 13 +#define JUSTIFY_CONTENT_SHIFT 4 +#define JUSTIFY_CONTENT_MASK 0x70 static inline css_error set_justify_content(css_computed_style *style, uint8_t type) @@ -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 1 -#define LETTER_SPACING_SHIFT 0 -#define LETTER_SPACING_MASK 0x7f +#define LETTER_SPACING_INDEX 6 +#define LETTER_SPACING_SHIFT 18 +#define LETTER_SPACING_MASK 0x1fc0000 static inline css_error set_letter_spacing(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 13 -#define LIST_STYLE_IMAGE_SHIFT 0 -#define LIST_STYLE_IMAGE_MASK 0x1 +#define LIST_STYLE_IMAGE_INDEX 14 +#define LIST_STYLE_IMAGE_SHIFT 27 +#define LIST_STYLE_IMAGE_MASK 0x8000000 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 14 -#define LIST_STYLE_POSITION_SHIFT 30 -#define LIST_STYLE_POSITION_MASK 0xc0000000 +#define LIST_STYLE_POSITION_INDEX 11 +#define LIST_STYLE_POSITION_SHIFT 6 +#define LIST_STYLE_POSITION_MASK 0xc0 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 13 -#define LIST_STYLE_TYPE_SHIFT 20 -#define LIST_STYLE_TYPE_MASK 0xf00000 +#define LIST_STYLE_TYPE_INDEX 8 +#define LIST_STYLE_TYPE_SHIFT 26 +#define LIST_STYLE_TYPE_MASK 0xfc000000 static inline css_error set_list_style_type(css_computed_style *style, uint8_t type) @@ -1579,8 +1579,8 @@ static inline css_error set_list_style_type(css_computed_style *style, uint8_t bits = &style->i.bits[LIST_STYLE_TYPE_INDEX]; - /* 4bits: tttt : type */ - *bits = (*bits & ~LIST_STYLE_TYPE_MASK) | (((uint32_t)type & 0xf) << + /* 6bits: tttttt : type */ + *bits = (*bits & ~LIST_STYLE_TYPE_MASK) | (((uint32_t)type & 0x3f) << LIST_STYLE_TYPE_SHIFT); return CSS_OK; @@ -1589,7 +1589,7 @@ 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 3 +#define MARGIN_BOTTOM_INDEX 5 #define MARGIN_BOTTOM_SHIFT 18 #define MARGIN_BOTTOM_MASK 0x1fc0000 @@ -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 3 -#define MARGIN_LEFT_SHIFT 11 -#define MARGIN_LEFT_MASK 0x3f800 +#define MARGIN_LEFT_INDEX 7 +#define MARGIN_LEFT_SHIFT 18 +#define MARGIN_LEFT_MASK 0x1fc0000 static inline css_error set_margin_left(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -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 7 -#define MARGIN_TOP_SHIFT 4 -#define MARGIN_TOP_MASK 0x7f0 +#define MARGIN_TOP_INDEX 1 +#define MARGIN_TOP_SHIFT 0 +#define MARGIN_TOP_MASK 0x7f 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 6 -#define MAX_HEIGHT_SHIFT 18 -#define MAX_HEIGHT_MASK 0x1fc0000 +#define MAX_HEIGHT_INDEX 3 +#define MAX_HEIGHT_SHIFT 25 +#define MAX_HEIGHT_MASK 0xfe000000 static inline css_error set_max_height(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1704,9 +1704,9 @@ 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 3 -#define MAX_WIDTH_SHIFT 25 -#define MAX_WIDTH_MASK 0xfe000000 +#define MAX_WIDTH_INDEX 7 +#define MAX_WIDTH_SHIFT 4 +#define MAX_WIDTH_MASK 0x7f0 static inline css_error set_max_width(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -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 7 -#define MIN_HEIGHT_SHIFT 11 -#define MIN_HEIGHT_MASK 0x3f800 +#define MIN_HEIGHT_INDEX 4 +#define MIN_HEIGHT_SHIFT 18 +#define MIN_HEIGHT_MASK 0x1fc0000 static inline css_error set_min_height(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 25 -#define OPACITY_MASK 0x2000000 +#define OPACITY_SHIFT 19 +#define OPACITY_MASK 0x80000 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 14 -#define ORDER_SHIFT 26 -#define ORDER_MASK 0x4000000 +#define ORDER_INDEX 13 +#define ORDER_SHIFT 0 +#define ORDER_MASK 0x1 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 22 -#define ORPHANS_MASK 0x400000 +#define ORPHANS_SHIFT 24 +#define ORPHANS_MASK 0x1000000 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 12 -#define OUTLINE_COLOR_MASK 0x3000 +#define OUTLINE_COLOR_SHIFT 10 +#define OUTLINE_COLOR_MASK 0xc00 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 5 -#define OUTLINE_STYLE_SHIFT 0 -#define OUTLINE_STYLE_MASK 0xf +#define OUTLINE_STYLE_INDEX 9 +#define OUTLINE_STYLE_SHIFT 7 +#define OUTLINE_STYLE_MASK 0x780 static inline css_error set_outline_style(css_computed_style *style, uint8_t type) @@ -1885,9 +1885,9 @@ static inline css_error set_outline_style(css_computed_style *style, uint8_t #undef OUTLINE_STYLE_SHIFT #undef OUTLINE_STYLE_MASK -#define OUTLINE_WIDTH_INDEX 0 -#define OUTLINE_WIDTH_SHIFT 16 -#define OUTLINE_WIDTH_MASK 0xff0000 +#define OUTLINE_WIDTH_INDEX 1 +#define OUTLINE_WIDTH_SHIFT 15 +#define OUTLINE_WIDTH_MASK 0x7f8000 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 9 -#define OVERFLOW_X_SHIFT 14 -#define OVERFLOW_X_MASK 0x1c000 +#define OVERFLOW_X_INDEX 13 +#define OVERFLOW_X_SHIFT 16 +#define OVERFLOW_X_MASK 0x70000 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 9 -#define OVERFLOW_Y_SHIFT 11 -#define OVERFLOW_Y_MASK 0x3800 +#define OVERFLOW_Y_INDEX 13 +#define OVERFLOW_Y_SHIFT 25 +#define OVERFLOW_Y_MASK 0xe000000 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 14 -#define PADDING_BOTTOM_MASK 0xfc000 +#define PADDING_BOTTOM_SHIFT 8 +#define PADDING_BOTTOM_MASK 0x3f00 static inline css_error set_padding_bottom(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1971,9 +1971,9 @@ static inline css_error set_padding_bottom(css_computed_style *style, uint8_t #undef PADDING_BOTTOM_SHIFT #undef PADDING_BOTTOM_MASK -#define PADDING_LEFT_INDEX 8 -#define PADDING_LEFT_SHIFT 26 -#define PADDING_LEFT_MASK 0xfc000000 +#define PADDING_LEFT_INDEX 2 +#define PADDING_LEFT_SHIFT 0 +#define PADDING_LEFT_MASK 0x3f static inline css_error set_padding_left(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -1995,8 +1995,8 @@ static inline css_error set_padding_left(css_computed_style *style, uint8_t #undef PADDING_LEFT_MASK #define PADDING_RIGHT_INDEX 8 -#define PADDING_RIGHT_SHIFT 20 -#define PADDING_RIGHT_MASK 0x3f00000 +#define PADDING_RIGHT_SHIFT 14 +#define PADDING_RIGHT_MASK 0xfc000 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 2 -#define PADDING_TOP_SHIFT 0 -#define PADDING_TOP_MASK 0x3f +#define PADDING_TOP_INDEX 8 +#define PADDING_TOP_SHIFT 20 +#define PADDING_TOP_MASK 0x3f00000 static inline css_error set_padding_top(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -2040,9 +2040,9 @@ static inline css_error set_padding_top(css_computed_style *style, uint8_t #undef PADDING_TOP_SHIFT #undef PADDING_TOP_MASK -#define PAGE_BREAK_AFTER_INDEX 9 -#define PAGE_BREAK_AFTER_SHIFT 2 -#define PAGE_BREAK_AFTER_MASK 0x1c +#define PAGE_BREAK_AFTER_INDEX 8 +#define PAGE_BREAK_AFTER_SHIFT 0 +#define PAGE_BREAK_AFTER_MASK 0x7 static inline css_error set_page_break_after(css_computed_style *style, uint8_t type) @@ -2061,9 +2061,9 @@ static inline css_error set_page_break_after(css_computed_style *style, uint8_t #undef PAGE_BREAK_AFTER_SHIFT #undef PAGE_BREAK_AFTER_MASK -#define PAGE_BREAK_BEFORE_INDEX 9 -#define PAGE_BREAK_BEFORE_SHIFT 23 -#define PAGE_BREAK_BEFORE_MASK 0x3800000 +#define PAGE_BREAK_BEFORE_INDEX 13 +#define PAGE_BREAK_BEFORE_SHIFT 7 +#define PAGE_BREAK_BEFORE_MASK 0x380 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 10 -#define PAGE_BREAK_INSIDE_SHIFT 4 -#define PAGE_BREAK_INSIDE_MASK 0x30 +#define PAGE_BREAK_INSIDE_INDEX 11 +#define PAGE_BREAK_INSIDE_SHIFT 24 +#define PAGE_BREAK_INSIDE_MASK 0x3000000 static inline css_error set_page_break_inside(css_computed_style *style, uint8_t type) @@ -2104,8 +2104,8 @@ static inline css_error set_page_break_inside(css_computed_style *style, #undef PAGE_BREAK_INSIDE_MASK #define POSITION_INDEX 10 -#define POSITION_SHIFT 26 -#define POSITION_MASK 0x1c000000 +#define POSITION_SHIFT 20 +#define POSITION_MASK 0x700000 static inline css_error set_position(css_computed_style *style, uint8_t type) { @@ -2124,8 +2124,8 @@ static inline css_error set_position(css_computed_style *style, uint8_t type) #undef POSITION_MASK #define QUOTES_INDEX 14 -#define QUOTES_SHIFT 27 -#define QUOTES_MASK 0x8000000 +#define QUOTES_SHIFT 21 +#define QUOTES_MASK 0x200000 static inline css_error set_quotes(css_computed_style *style, uint8_t type, lwc_string **string_arr) @@ -2161,9 +2161,9 @@ static inline css_error set_quotes(css_computed_style *style, uint8_t type, #undef QUOTES_SHIFT #undef QUOTES_MASK -#define RIGHT_INDEX 7 -#define RIGHT_SHIFT 25 -#define RIGHT_MASK 0xfe000000 +#define RIGHT_INDEX 3 +#define RIGHT_SHIFT 18 +#define RIGHT_MASK 0x1fc0000 static inline css_error set_right(css_computed_style *style, uint8_t type, css_fixed length, css_unit unit) @@ -2184,9 +2184,9 @@ static inline css_error set_right(css_computed_style *style, uint8_t type, #undef RIGHT_SHIFT #undef RIGHT_MASK -#define TABLE_LAYOUT_INDEX 11 -#define TABLE_LAYOUT_SHIFT 4 -#define TABLE_LAYOUT_MASK 0x30 +#define TABLE_LAYOUT_INDEX 10 +#define TABLE_LAYOUT_SHIFT 14 +#define TABLE_LAYOUT_MASK 0xc000 static inline css_error set_table_layout(css_computed_style *style, uint8_t type) @@ -2205,9 +2205,9 @@ static inline css_error set_table_layout(css_computed_style *style, uint8_t #undef TABLE_LAYOUT_SHIFT #undef TABLE_LAYOUT_MASK -#define TEXT_ALIGN_INDEX 13 -#define TEXT_ALIGN_SHIFT 16 -#define TEXT_ALIGN_MASK 0xf0000 +#define TEXT_ALIGN_INDEX 4 +#define TEXT_ALIGN_SHIFT 0 +#define TEXT_ALIGN_MASK 0xf 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 9 -#define TEXT_DECORATION_MASK 0x3e00 +#define TEXT_DECORATION_SHIFT 3 +#define TEXT_DECORATION_MASK 0xf8 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 9 -#define TEXT_TRANSFORM_SHIFT 8 -#define TEXT_TRANSFORM_MASK 0x700 +#define TEXT_TRANSFORM_INDEX 13 +#define TEXT_TRANSFORM_SHIFT 13 +#define TEXT_TRANSFORM_MASK 0xe000 static inline css_error set_text_transform(css_computed_style *style, uint8_t type) @@ -2290,7 +2290,7 @@ static inline css_error set_text_transform(css_computed_style *style, uint8_t #undef TEXT_TRANSFORM_SHIFT #undef TEXT_TRANSFORM_MASK -#define TOP_INDEX 6 +#define TOP_INDEX 7 #define TOP_SHIFT 25 #define TOP_MASK 0xfe000000 @@ -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 9 -#define UNICODE_BIDI_SHIFT 0 -#define UNICODE_BIDI_MASK 0x3 +#define UNICODE_BIDI_INDEX 11 +#define UNICODE_BIDI_SHIFT 2 +#define UNICODE_BIDI_MASK 0xc static inline css_error set_unicode_bidi(css_computed_style *style, uint8_t type) @@ -2358,8 +2358,8 @@ static inline css_error set_vertical_align(css_computed_style *style, uint8_t #undef VERTICAL_ALIGN_MASK #define VISIBILITY_INDEX 11 -#define VISIBILITY_SHIFT 14 -#define VISIBILITY_MASK 0xc000 +#define VISIBILITY_SHIFT 0 +#define VISIBILITY_MASK 0x3 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 10 -#define WHITE_SPACE_SHIFT 20 -#define WHITE_SPACE_MASK 0x700000 +#define WHITE_SPACE_INDEX 13 +#define WHITE_SPACE_SHIFT 19 +#define WHITE_SPACE_MASK 0x380000 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 24 -#define WIDOWS_MASK 0x1000000 +#define WIDOWS_SHIFT 26 +#define WIDOWS_MASK 0x4000000 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 5 -#define WIDTH_SHIFT 25 -#define WIDTH_MASK 0xfe000000 +#define WIDTH_INDEX 3 +#define WIDTH_SHIFT 11 +#define WIDTH_MASK 0x3f800 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 4 -#define WORD_SPACING_SHIFT 25 -#define WORD_SPACING_MASK 0xfe000000 +#define WORD_SPACING_INDEX 5 +#define WORD_SPACING_SHIFT 4 +#define WORD_SPACING_MASK 0x7f0 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 11 -#define WRITING_MODE_SHIFT 18 -#define WRITING_MODE_MASK 0xc0000 +#define WRITING_MODE_INDEX 14 +#define WRITING_MODE_SHIFT 30 +#define WRITING_MODE_MASK 0xc0000000 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 11 -#define Z_INDEX_SHIFT 2 -#define Z_INDEX_MASK 0xc +#define Z_INDEX_INDEX 10 +#define Z_INDEX_SHIFT 8 +#define Z_INDEX_MASK 0x300 static inline css_error set_z_index(css_computed_style *style, uint8_t type, int32_t integer) diff --git a/src/select/select_config.py b/src/select/select_config.py index 8845814..fd9e765 100644 --- a/src/select/select_config.py +++ b/src/select/select_config.py @@ -49,7 +49,7 @@ style = { ('font_weight', 4), ('justify_content', 3), ('list_style_position', 2), - ('list_style_type', 4), + ('list_style_type', 6), ('overflow_x', 3), ('overflow_y', 3), ('outline_style', 4), |