From 2f7718d8de04be49dead46665489585cc2a323cb Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Sat, 28 Jul 2018 15:23:25 +0100
Subject: Select generator: Squash undefined behaviour in generated code.

uint8_t is promoted to int instead of unsigned, so it can't hold
the values we try to store.

Reran `make select_generator` to update generated code.
---
 src/select/autogenerated_propget.h | 404 ++++++++++++++++++-------------------
 1 file changed, 202 insertions(+), 202 deletions(-)

(limited to 'src/select/autogenerated_propget.h')

diff --git a/src/select/autogenerated_propget.h b/src/select/autogenerated_propget.h
index 202f7de..5c63c5e 100644
--- a/src/select/autogenerated_propget.h
+++ b/src/select/autogenerated_propget.h
@@ -40,9 +40,9 @@ static inline uint8_t get_border_spacing(const css_computed_style *style,
 #undef BORDER_SPACING_SHIFT
 #undef BORDER_SPACING_MASK
 
-#define BREAK_AFTER_INDEX 1
-#define BREAK_AFTER_SHIFT 0
-#define BREAK_AFTER_MASK 0xf
+#define BREAK_AFTER_INDEX 3
+#define BREAK_AFTER_SHIFT 28
+#define BREAK_AFTER_MASK 0xf0000000
 static inline uint8_t get_break_after(const css_computed_style *style)
 {
 	if (style->i.uncommon != NULL) {
@@ -62,9 +62,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 2
-#define BREAK_BEFORE_SHIFT 2
-#define BREAK_BEFORE_MASK 0x3c
+#define BREAK_BEFORE_INDEX 1
+#define BREAK_BEFORE_SHIFT 0
+#define BREAK_BEFORE_MASK 0xf
 static inline uint8_t get_break_before(const css_computed_style *style)
 {
 	if (style->i.uncommon != NULL) {
@@ -85,8 +85,8 @@ static inline uint8_t get_break_before(const css_computed_style *style)
 #undef BREAK_BEFORE_MASK
 
 #define BREAK_INSIDE_INDEX 3
-#define BREAK_INSIDE_SHIFT 28
-#define BREAK_INSIDE_MASK 0xf0000000
+#define BREAK_INSIDE_SHIFT 24
+#define BREAK_INSIDE_MASK 0xf000000
 static inline uint8_t get_break_inside(const css_computed_style *style)
 {
 	if (style->i.uncommon != NULL) {
@@ -153,9 +153,9 @@ static inline uint8_t get_clip(
 #undef CLIP_SHIFT
 #undef CLIP_MASK
 
-#define COLUMN_COUNT_INDEX 2
-#define COLUMN_COUNT_SHIFT 0
-#define COLUMN_COUNT_MASK 0x3
+#define COLUMN_COUNT_INDEX 3
+#define COLUMN_COUNT_SHIFT 14
+#define COLUMN_COUNT_MASK 0xc000
 static inline uint8_t get_column_count(const css_computed_style *style, int32_t
 		*integer)
 {
@@ -179,8 +179,8 @@ static inline uint8_t get_column_count(const css_computed_style *style, int32_t
 #undef COLUMN_COUNT_MASK
 
 #define COLUMN_FILL_INDEX 3
-#define COLUMN_FILL_SHIFT 12
-#define COLUMN_FILL_MASK 0x3000
+#define COLUMN_FILL_SHIFT 18
+#define COLUMN_FILL_MASK 0xc0000
 static inline uint8_t get_column_fill(const css_computed_style *style)
 {
 	if (style->i.uncommon != NULL) {
@@ -229,9 +229,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 3
-#define COLUMN_RULE_COLOR_SHIFT 18
-#define COLUMN_RULE_COLOR_MASK 0xc0000
+#define COLUMN_RULE_COLOR_INDEX 2
+#define COLUMN_RULE_COLOR_SHIFT 0
+#define COLUMN_RULE_COLOR_MASK 0x3
 static inline uint8_t get_column_rule_color(const css_computed_style *style,
 		css_color *color)
 {
@@ -255,9 +255,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 3
-#define COLUMN_RULE_STYLE_SHIFT 24
-#define COLUMN_RULE_STYLE_MASK 0xf000000
+#define COLUMN_RULE_STYLE_INDEX 2
+#define COLUMN_RULE_STYLE_SHIFT 2
+#define COLUMN_RULE_STYLE_MASK 0x3c
 static inline uint8_t get_column_rule_style(const css_computed_style *style)
 {
 	if (style->i.uncommon != NULL) {
@@ -279,8 +279,8 @@ static inline uint8_t get_column_rule_style(const css_computed_style *style)
 #undef COLUMN_RULE_STYLE_MASK
 
 #define COLUMN_RULE_WIDTH_INDEX 0
-#define COLUMN_RULE_WIDTH_SHIFT 13
-#define COLUMN_RULE_WIDTH_MASK 0x1fe000
+#define COLUMN_RULE_WIDTH_SHIFT 5
+#define COLUMN_RULE_WIDTH_MASK 0x1fe0
 static inline uint8_t get_column_rule_width(const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
 {
@@ -309,8 +309,8 @@ static inline uint8_t get_column_rule_width(const css_computed_style *style,
 #undef COLUMN_RULE_WIDTH_MASK
 
 #define COLUMN_SPAN_INDEX 3
-#define COLUMN_SPAN_SHIFT 20
-#define COLUMN_SPAN_MASK 0x300000
+#define COLUMN_SPAN_SHIFT 16
+#define COLUMN_SPAN_MASK 0x30000
 static inline uint8_t get_column_span(const css_computed_style *style)
 {
 	if (style->i.uncommon != NULL) {
@@ -331,8 +331,8 @@ static inline uint8_t get_column_span(const css_computed_style *style)
 #undef COLUMN_SPAN_MASK
 
 #define COLUMN_WIDTH_INDEX 1
-#define COLUMN_WIDTH_SHIFT 11
-#define COLUMN_WIDTH_MASK 0x3f800
+#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)
 {
@@ -360,8 +360,8 @@ static inline uint8_t get_column_width(const css_computed_style *style,
 #undef COLUMN_WIDTH_MASK
 
 #define CONTENT_INDEX 3
-#define CONTENT_SHIFT 14
-#define CONTENT_MASK 0xc000
+#define CONTENT_SHIFT 22
+#define CONTENT_MASK 0xc00000
 static inline uint8_t get_content(const css_computed_style *style, const
 		css_computed_content_item **content_item)
 {
@@ -463,8 +463,8 @@ static inline uint8_t get_cursor(const css_computed_style *style, lwc_string
 #undef CURSOR_MASK
 
 #define LETTER_SPACING_INDEX 1
-#define LETTER_SPACING_SHIFT 25
-#define LETTER_SPACING_MASK 0xfe000000
+#define LETTER_SPACING_SHIFT 11
+#define LETTER_SPACING_MASK 0x3f800
 static inline uint8_t get_letter_spacing(const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
 {
@@ -492,8 +492,8 @@ static inline uint8_t get_letter_spacing(const css_computed_style *style,
 #undef LETTER_SPACING_MASK
 
 #define OUTLINE_COLOR_INDEX 3
-#define OUTLINE_COLOR_SHIFT 16
-#define OUTLINE_COLOR_MASK 0x30000
+#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)
 {
@@ -519,8 +519,8 @@ static inline uint8_t get_outline_color(const css_computed_style *style,
 #undef OUTLINE_COLOR_MASK
 
 #define OUTLINE_WIDTH_INDEX 0
-#define OUTLINE_WIDTH_SHIFT 5
-#define OUTLINE_WIDTH_MASK 0x1fe0
+#define OUTLINE_WIDTH_SHIFT 13
+#define OUTLINE_WIDTH_MASK 0x1fe000
 static inline uint8_t get_outline_width(const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
 {
@@ -577,8 +577,8 @@ static inline uint8_t get_word_spacing(const css_computed_style *style,
 #undef WORD_SPACING_MASK
 
 #define WRITING_MODE_INDEX 3
-#define WRITING_MODE_SHIFT 22
-#define WRITING_MODE_MASK 0xc00000
+#define WRITING_MODE_SHIFT 20
+#define WRITING_MODE_MASK 0x300000
 static inline uint8_t get_writing_mode(const css_computed_style *style)
 {
 	if (style->i.uncommon != NULL) {
@@ -715,8 +715,8 @@ static inline uint8_t get_widows(const css_computed_style *style, int32_t
 #undef WIDOWS_MASK
 
 #define ALIGN_CONTENT_INDEX 8
-#define ALIGN_CONTENT_SHIFT 8
-#define ALIGN_CONTENT_MASK 0x700
+#define ALIGN_CONTENT_SHIFT 14
+#define ALIGN_CONTENT_MASK 0x1c000
 static inline uint8_t get_align_content(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[ALIGN_CONTENT_INDEX];
@@ -732,8 +732,8 @@ static inline uint8_t get_align_content(const css_computed_style *style)
 #undef ALIGN_CONTENT_MASK
 
 #define ALIGN_ITEMS_INDEX 8
-#define ALIGN_ITEMS_SHIFT 17
-#define ALIGN_ITEMS_MASK 0xe0000
+#define ALIGN_ITEMS_SHIFT 23
+#define ALIGN_ITEMS_MASK 0x3800000
 static inline uint8_t get_align_items(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[ALIGN_ITEMS_INDEX];
@@ -766,8 +766,8 @@ static inline uint8_t get_align_self(const css_computed_style *style)
 #undef ALIGN_SELF_MASK
 
 #define BACKGROUND_ATTACHMENT_INDEX 9
-#define BACKGROUND_ATTACHMENT_SHIFT 26
-#define BACKGROUND_ATTACHMENT_MASK 0xc000000
+#define BACKGROUND_ATTACHMENT_SHIFT 6
+#define BACKGROUND_ATTACHMENT_MASK 0xc0
 static inline uint8_t get_background_attachment(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[BACKGROUND_ATTACHMENT_INDEX];
@@ -782,9 +782,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 7
-#define BACKGROUND_COLOR_SHIFT 0
-#define BACKGROUND_COLOR_MASK 0x3
+#define BACKGROUND_COLOR_INDEX 9
+#define BACKGROUND_COLOR_SHIFT 14
+#define BACKGROUND_COLOR_MASK 0xc000
 static inline uint8_t get_background_color(const css_computed_style *style,
 		css_color *color)
 {
@@ -802,8 +802,8 @@ static inline uint8_t get_background_color(const css_computed_style *style,
 #undef BACKGROUND_COLOR_MASK
 
 #define BACKGROUND_IMAGE_INDEX 10
-#define BACKGROUND_IMAGE_SHIFT 27
-#define BACKGROUND_IMAGE_MASK 0x8000000
+#define BACKGROUND_IMAGE_SHIFT 25
+#define BACKGROUND_IMAGE_MASK 0x2000000
 static inline uint8_t get_background_image(const css_computed_style *style,
 		lwc_string **string)
 {
@@ -845,9 +845,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 6
-#define BACKGROUND_REPEAT_SHIFT 3
-#define BACKGROUND_REPEAT_MASK 0x38
+#define BACKGROUND_REPEAT_INDEX 8
+#define BACKGROUND_REPEAT_SHIFT 17
+#define BACKGROUND_REPEAT_MASK 0xe0000
 static inline uint8_t get_background_repeat(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[BACKGROUND_REPEAT_INDEX];
@@ -863,8 +863,8 @@ static inline uint8_t get_background_repeat(const css_computed_style *style)
 #undef BACKGROUND_REPEAT_MASK
 
 #define BORDER_BOTTOM_COLOR_INDEX 9
-#define BORDER_BOTTOM_COLOR_SHIFT 8
-#define BORDER_BOTTOM_COLOR_MASK 0x300
+#define BORDER_BOTTOM_COLOR_SHIFT 4
+#define BORDER_BOTTOM_COLOR_MASK 0x30
 static inline uint8_t get_border_bottom_color(const css_computed_style *style,
 		css_color *color)
 {
@@ -882,8 +882,8 @@ static inline uint8_t get_border_bottom_color(const css_computed_style *style,
 #undef BORDER_BOTTOM_COLOR_MASK
 
 #define BORDER_BOTTOM_STYLE_INDEX 6
-#define BORDER_BOTTOM_STYLE_SHIFT 18
-#define BORDER_BOTTOM_STYLE_MASK 0x3c0000
+#define BORDER_BOTTOM_STYLE_SHIFT 6
+#define BORDER_BOTTOM_STYLE_MASK 0x3c0
 static inline uint8_t get_border_bottom_style(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[BORDER_BOTTOM_STYLE_INDEX];
@@ -899,8 +899,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 24
-#define BORDER_BOTTOM_WIDTH_MASK 0xff000000
+#define BORDER_BOTTOM_WIDTH_SHIFT 16
+#define BORDER_BOTTOM_WIDTH_MASK 0xff0000
 static inline uint8_t get_border_bottom_width(const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
 {
@@ -920,9 +920,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 28
-#define BORDER_COLLAPSE_MASK 0x30000000
+#define BORDER_COLLAPSE_INDEX 9
+#define BORDER_COLLAPSE_SHIFT 26
+#define BORDER_COLLAPSE_MASK 0xc000000
 static inline uint8_t get_border_collapse(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[BORDER_COLLAPSE_INDEX];
@@ -937,9 +937,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 10
-#define BORDER_LEFT_COLOR_SHIFT 30
-#define BORDER_LEFT_COLOR_MASK 0xc0000000
+#define BORDER_LEFT_COLOR_INDEX 9
+#define BORDER_LEFT_COLOR_SHIFT 24
+#define BORDER_LEFT_COLOR_MASK 0x3000000
 static inline uint8_t get_border_left_color(const css_computed_style *style,
 		css_color *color)
 {
@@ -956,9 +956,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 6
-#define BORDER_LEFT_STYLE_SHIFT 14
-#define BORDER_LEFT_STYLE_MASK 0x3c000
+#define BORDER_LEFT_STYLE_INDEX 4
+#define BORDER_LEFT_STYLE_SHIFT 0
+#define BORDER_LEFT_STYLE_MASK 0xf
 static inline uint8_t get_border_left_style(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[BORDER_LEFT_STYLE_INDEX];
@@ -974,8 +974,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 0
+#define BORDER_LEFT_WIDTH_MASK 0xff
 static inline uint8_t get_border_left_width(const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
 {
@@ -996,8 +996,8 @@ static inline uint8_t get_border_left_width(const css_computed_style *style,
 #undef BORDER_LEFT_WIDTH_MASK
 
 #define BORDER_RIGHT_COLOR_INDEX 9
-#define BORDER_RIGHT_COLOR_SHIFT 28
-#define BORDER_RIGHT_COLOR_MASK 0x30000000
+#define BORDER_RIGHT_COLOR_SHIFT 30
+#define BORDER_RIGHT_COLOR_MASK 0xc0000000
 static inline uint8_t get_border_right_color(const css_computed_style *style,
 		css_color *color)
 {
@@ -1014,9 +1014,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 2
-#define BORDER_RIGHT_STYLE_SHIFT 0
-#define BORDER_RIGHT_STYLE_MASK 0xf
+#define BORDER_RIGHT_STYLE_INDEX 6
+#define BORDER_RIGHT_STYLE_SHIFT 14
+#define BORDER_RIGHT_STYLE_MASK 0x3c000
 static inline uint8_t get_border_right_style(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[BORDER_RIGHT_STYLE_INDEX];
@@ -1032,8 +1032,8 @@ static inline uint8_t get_border_right_style(const css_computed_style *style)
 #undef BORDER_RIGHT_STYLE_MASK
 
 #define BORDER_RIGHT_WIDTH_INDEX 0
-#define BORDER_RIGHT_WIDTH_SHIFT 0
-#define BORDER_RIGHT_WIDTH_MASK 0xff
+#define BORDER_RIGHT_WIDTH_SHIFT 8
+#define BORDER_RIGHT_WIDTH_MASK 0xff00
 static inline uint8_t get_border_right_width(const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
 {
@@ -1053,9 +1053,9 @@ static inline uint8_t get_border_right_width(const css_computed_style *style,
 #undef BORDER_RIGHT_WIDTH_SHIFT
 #undef BORDER_RIGHT_WIDTH_MASK
 
-#define BORDER_TOP_COLOR_INDEX 9
-#define BORDER_TOP_COLOR_SHIFT 16
-#define BORDER_TOP_COLOR_MASK 0x30000
+#define BORDER_TOP_COLOR_INDEX 8
+#define BORDER_TOP_COLOR_SHIFT 0
+#define BORDER_TOP_COLOR_MASK 0x3
 static inline uint8_t get_border_top_color(const css_computed_style *style,
 		css_color *color)
 {
@@ -1072,9 +1072,9 @@ 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 1
-#define BORDER_TOP_STYLE_SHIFT 0
-#define BORDER_TOP_STYLE_MASK 0xf
+#define BORDER_TOP_STYLE_INDEX 6
+#define BORDER_TOP_STYLE_SHIFT 10
+#define BORDER_TOP_STYLE_MASK 0x3c00
 static inline uint8_t get_border_top_style(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[BORDER_TOP_STYLE_INDEX];
@@ -1090,8 +1090,8 @@ static inline uint8_t get_border_top_style(const css_computed_style *style)
 #undef BORDER_TOP_STYLE_MASK
 
 #define BORDER_TOP_WIDTH_INDEX 0
-#define BORDER_TOP_WIDTH_SHIFT 8
-#define BORDER_TOP_WIDTH_MASK 0xff00
+#define BORDER_TOP_WIDTH_SHIFT 24
+#define BORDER_TOP_WIDTH_MASK 0xff000000
 static inline uint8_t get_border_top_width(const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
 {
@@ -1111,9 +1111,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 3
-#define BOTTOM_SHIFT 18
-#define BOTTOM_MASK 0x1fc0000
+#define BOTTOM_INDEX 4
+#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)
@@ -1145,8 +1145,8 @@ static inline uint8_t get_bottom_bits(
 #undef BOTTOM_MASK
 
 #define BOX_SIZING_INDEX 9
-#define BOX_SIZING_SHIFT 2
-#define BOX_SIZING_MASK 0xc
+#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];
@@ -1162,8 +1162,8 @@ static inline uint8_t get_box_sizing(const css_computed_style *style)
 #undef BOX_SIZING_MASK
 
 #define CAPTION_SIDE_INDEX 9
-#define CAPTION_SIDE_SHIFT 10
-#define CAPTION_SIDE_MASK 0xc00
+#define CAPTION_SIDE_SHIFT 20
+#define CAPTION_SIDE_MASK 0x300000
 static inline uint8_t get_caption_side(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[CAPTION_SIDE_INDEX];
@@ -1179,8 +1179,8 @@ static inline uint8_t get_caption_side(const css_computed_style *style)
 #undef CAPTION_SIDE_MASK
 
 #define CLEAR_INDEX 8
-#define CLEAR_SHIFT 11
-#define CLEAR_MASK 0x3800
+#define CLEAR_SHIFT 2
+#define CLEAR_MASK 0x1c
 static inline uint8_t get_clear(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[CLEAR_INDEX];
@@ -1196,8 +1196,8 @@ static inline uint8_t get_clear(const css_computed_style *style)
 #undef CLEAR_MASK
 
 #define COLOR_INDEX 10
-#define COLOR_SHIFT 26
-#define COLOR_MASK 0x4000000
+#define COLOR_SHIFT 24
+#define COLOR_MASK 0x1000000
 static inline uint8_t get_color(const css_computed_style *style, css_color
 		*color)
 {
@@ -1214,9 +1214,9 @@ static inline uint8_t get_color(const css_computed_style *style, css_color
 #undef COLOR_SHIFT
 #undef COLOR_MASK
 
-#define DIRECTION_INDEX 8
-#define DIRECTION_SHIFT 0
-#define DIRECTION_MASK 0x3
+#define DIRECTION_INDEX 9
+#define DIRECTION_SHIFT 22
+#define DIRECTION_MASK 0xc00000
 static inline uint8_t get_direction(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[DIRECTION_INDEX];
@@ -1249,8 +1249,8 @@ static inline uint8_t get_display(const css_computed_style *style)
 #undef DISPLAY_MASK
 
 #define EMPTY_CELLS_INDEX 9
-#define EMPTY_CELLS_SHIFT 12
-#define EMPTY_CELLS_MASK 0x3000
+#define EMPTY_CELLS_SHIFT 18
+#define EMPTY_CELLS_MASK 0xc0000
 static inline uint8_t get_empty_cells(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[EMPTY_CELLS_INDEX];
@@ -1265,9 +1265,9 @@ static inline uint8_t get_empty_cells(const css_computed_style *style)
 #undef EMPTY_CELLS_SHIFT
 #undef EMPTY_CELLS_MASK
 
-#define FLEX_BASIS_INDEX 1
-#define FLEX_BASIS_SHIFT 4
-#define FLEX_BASIS_MASK 0x7f0
+#define FLEX_BASIS_INDEX 2
+#define FLEX_BASIS_SHIFT 11
+#define FLEX_BASIS_MASK 0x3f800
 static inline uint8_t get_flex_basis(const css_computed_style *style, css_fixed
 		*length, css_unit *unit)
 {
@@ -1287,9 +1287,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 6
-#define FLEX_DIRECTION_SHIFT 0
-#define FLEX_DIRECTION_MASK 0x7
+#define FLEX_DIRECTION_INDEX 8
+#define FLEX_DIRECTION_SHIFT 11
+#define FLEX_DIRECTION_MASK 0x3800
 static inline uint8_t get_flex_direction(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[FLEX_DIRECTION_INDEX];
@@ -1305,8 +1305,8 @@ static inline uint8_t get_flex_direction(const css_computed_style *style)
 #undef FLEX_DIRECTION_MASK
 
 #define FLEX_GROW_INDEX 10
-#define FLEX_GROW_SHIFT 23
-#define FLEX_GROW_MASK 0x800000
+#define FLEX_GROW_SHIFT 21
+#define FLEX_GROW_MASK 0x200000
 static inline uint8_t get_flex_grow(const css_computed_style *style, css_fixed
 		*fixed)
 {
@@ -1326,8 +1326,8 @@ static inline uint8_t get_flex_grow(const css_computed_style *style, css_fixed
 #undef FLEX_GROW_MASK
 
 #define FLEX_SHRINK_INDEX 10
-#define FLEX_SHRINK_SHIFT 20
-#define FLEX_SHRINK_MASK 0x100000
+#define FLEX_SHRINK_SHIFT 23
+#define FLEX_SHRINK_MASK 0x800000
 static inline uint8_t get_flex_shrink(const css_computed_style *style,
 		css_fixed *fixed)
 {
@@ -1347,8 +1347,8 @@ static inline uint8_t get_flex_shrink(const css_computed_style *style,
 #undef FLEX_SHRINK_MASK
 
 #define FLEX_WRAP_INDEX 9
-#define FLEX_WRAP_SHIFT 20
-#define FLEX_WRAP_MASK 0x300000
+#define FLEX_WRAP_SHIFT 28
+#define FLEX_WRAP_MASK 0x30000000
 static inline uint8_t get_flex_wrap(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[FLEX_WRAP_INDEX];
@@ -1364,8 +1364,8 @@ static inline uint8_t get_flex_wrap(const css_computed_style *style)
 #undef FLEX_WRAP_MASK
 
 #define FLOAT_INDEX 9
-#define FLOAT_SHIFT 14
-#define FLOAT_MASK 0xc000
+#define FLOAT_SHIFT 8
+#define FLOAT_MASK 0x300
 static inline uint8_t get_float(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[FLOAT_INDEX];
@@ -1421,9 +1421,9 @@ static inline uint8_t get_font_size(const css_computed_style *style, css_fixed
 #undef FONT_SIZE_SHIFT
 #undef FONT_SIZE_MASK
 
-#define FONT_STYLE_INDEX 9
-#define FONT_STYLE_SHIFT 22
-#define FONT_STYLE_MASK 0xc00000
+#define FONT_STYLE_INDEX 7
+#define FONT_STYLE_SHIFT 0
+#define FONT_STYLE_MASK 0x3
 static inline uint8_t get_font_style(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[FONT_STYLE_INDEX];
@@ -1439,8 +1439,8 @@ static inline uint8_t get_font_style(const css_computed_style *style)
 #undef FONT_STYLE_MASK
 
 #define FONT_VARIANT_INDEX 9
-#define FONT_VARIANT_SHIFT 6
-#define FONT_VARIANT_MASK 0xc0
+#define FONT_VARIANT_SHIFT 10
+#define FONT_VARIANT_MASK 0xc00
 static inline uint8_t get_font_variant(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[FONT_VARIANT_INDEX];
@@ -1455,7 +1455,7 @@ 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_INDEX 3
 #define FONT_WEIGHT_SHIFT 0
 #define FONT_WEIGHT_MASK 0xf
 static inline uint8_t get_font_weight(const css_computed_style *style)
@@ -1472,7 +1472,7 @@ static inline uint8_t get_font_weight(const css_computed_style *style)
 #undef FONT_WEIGHT_SHIFT
 #undef FONT_WEIGHT_MASK
 
-#define HEIGHT_INDEX 2
+#define HEIGHT_INDEX 4
 #define HEIGHT_SHIFT 4
 #define HEIGHT_MASK 0x7f0
 static inline uint8_t get_height(const css_computed_style *style, css_fixed
@@ -1495,8 +1495,8 @@ static inline uint8_t get_height(const css_computed_style *style, css_fixed
 #undef HEIGHT_MASK
 
 #define JUSTIFY_CONTENT_INDEX 8
-#define JUSTIFY_CONTENT_SHIFT 5
-#define JUSTIFY_CONTENT_MASK 0xe0
+#define JUSTIFY_CONTENT_SHIFT 8
+#define JUSTIFY_CONTENT_MASK 0x700
 static inline uint8_t get_justify_content(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[JUSTIFY_CONTENT_INDEX];
@@ -1511,7 +1511,7 @@ static inline uint8_t get_justify_content(const css_computed_style *style)
 #undef JUSTIFY_CONTENT_SHIFT
 #undef JUSTIFY_CONTENT_MASK
 
-#define LEFT_INDEX 3
+#define LEFT_INDEX 4
 #define LEFT_SHIFT 25
 #define LEFT_MASK 0xfe000000
 static inline uint8_t get_left(
@@ -1544,9 +1544,9 @@ static inline uint8_t get_left_bits(
 #undef LEFT_SHIFT
 #undef LEFT_MASK
 
-#define LINE_HEIGHT_INDEX 2
-#define LINE_HEIGHT_SHIFT 11
-#define LINE_HEIGHT_MASK 0x3f800
+#define LINE_HEIGHT_INDEX 1
+#define LINE_HEIGHT_SHIFT 25
+#define LINE_HEIGHT_MASK 0xfe000000
 static inline uint8_t get_line_height(
 		const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
@@ -1572,8 +1572,8 @@ static inline uint8_t get_line_height(
 #undef LINE_HEIGHT_MASK
 
 #define LIST_STYLE_IMAGE_INDEX 10
-#define LIST_STYLE_IMAGE_SHIFT 25
-#define LIST_STYLE_IMAGE_MASK 0x2000000
+#define LIST_STYLE_IMAGE_SHIFT 26
+#define LIST_STYLE_IMAGE_MASK 0x4000000
 static inline uint8_t get_list_style_image(const css_computed_style *style,
 		lwc_string **string)
 {
@@ -1591,8 +1591,8 @@ static inline uint8_t get_list_style_image(const css_computed_style *style,
 #undef LIST_STYLE_IMAGE_MASK
 
 #define LIST_STYLE_POSITION_INDEX 9
-#define LIST_STYLE_POSITION_SHIFT 0
-#define LIST_STYLE_POSITION_MASK 0x3
+#define LIST_STYLE_POSITION_SHIFT 2
+#define LIST_STYLE_POSITION_MASK 0xc
 static inline uint8_t get_list_style_position(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[LIST_STYLE_POSITION_INDEX];
@@ -1607,9 +1607,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 3
-#define LIST_STYLE_TYPE_SHIFT 0
-#define LIST_STYLE_TYPE_MASK 0xf
+#define LIST_STYLE_TYPE_INDEX 6
+#define LIST_STYLE_TYPE_SHIFT 18
+#define LIST_STYLE_TYPE_MASK 0x3c0000
 static inline uint8_t get_list_style_type(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[LIST_STYLE_TYPE_INDEX];
@@ -1624,9 +1624,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 2
-#define MARGIN_BOTTOM_SHIFT 25
-#define MARGIN_BOTTOM_MASK 0xfe000000
+#define MARGIN_BOTTOM_INDEX 3
+#define MARGIN_BOTTOM_SHIFT 4
+#define MARGIN_BOTTOM_MASK 0x7f0
 static inline uint8_t get_margin_bottom(const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
 {
@@ -1646,7 +1646,7 @@ static inline uint8_t get_margin_bottom(const css_computed_style *style,
 #undef MARGIN_BOTTOM_SHIFT
 #undef MARGIN_BOTTOM_MASK
 
-#define MARGIN_LEFT_INDEX 4
+#define MARGIN_LEFT_INDEX 1
 #define MARGIN_LEFT_SHIFT 4
 #define MARGIN_LEFT_MASK 0x7f0
 static inline uint8_t get_margin_left(const css_computed_style *style,
@@ -1668,9 +1668,9 @@ static inline uint8_t get_margin_left(const css_computed_style *style,
 #undef MARGIN_LEFT_SHIFT
 #undef MARGIN_LEFT_MASK
 
-#define MARGIN_RIGHT_INDEX 1
-#define MARGIN_RIGHT_SHIFT 25
-#define MARGIN_RIGHT_MASK 0xfe000000
+#define MARGIN_RIGHT_INDEX 2
+#define MARGIN_RIGHT_SHIFT 18
+#define MARGIN_RIGHT_MASK 0x1fc0000
 static inline uint8_t get_margin_right(const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
 {
@@ -1690,7 +1690,7 @@ static inline uint8_t get_margin_right(const css_computed_style *style,
 #undef MARGIN_RIGHT_SHIFT
 #undef MARGIN_RIGHT_MASK
 
-#define MARGIN_TOP_INDEX 4
+#define MARGIN_TOP_INDEX 3
 #define MARGIN_TOP_SHIFT 18
 #define MARGIN_TOP_MASK 0x1fc0000
 static inline uint8_t get_margin_top(const css_computed_style *style, css_fixed
@@ -1712,9 +1712,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 3
-#define MAX_HEIGHT_SHIFT 11
-#define MAX_HEIGHT_MASK 0x3f800
+#define MAX_HEIGHT_INDEX 2
+#define MAX_HEIGHT_SHIFT 4
+#define MAX_HEIGHT_MASK 0x7f0
 static inline uint8_t get_max_height(const css_computed_style *style, css_fixed
 		*length, css_unit *unit)
 {
@@ -1734,9 +1734,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 1
-#define MAX_WIDTH_SHIFT 18
-#define MAX_WIDTH_MASK 0x1fc0000
+#define MAX_WIDTH_INDEX 2
+#define MAX_WIDTH_SHIFT 25
+#define MAX_WIDTH_MASK 0xfe000000
 static inline uint8_t get_max_width(const css_computed_style *style, css_fixed
 		*length, css_unit *unit)
 {
@@ -1757,8 +1757,8 @@ static inline uint8_t get_max_width(const css_computed_style *style, css_fixed
 #undef MAX_WIDTH_MASK
 
 #define MIN_HEIGHT_INDEX 3
-#define MIN_HEIGHT_SHIFT 4
-#define MIN_HEIGHT_MASK 0x7f0
+#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)
 {
@@ -1778,9 +1778,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 2
-#define MIN_WIDTH_SHIFT 18
-#define MIN_WIDTH_MASK 0x1fc0000
+#define MIN_WIDTH_INDEX 1
+#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)
 {
@@ -1801,8 +1801,8 @@ static inline uint8_t get_min_width(const css_computed_style *style, css_fixed
 #undef MIN_WIDTH_MASK
 
 #define OPACITY_INDEX 10
-#define OPACITY_SHIFT 21
-#define OPACITY_MASK 0x200000
+#define OPACITY_SHIFT 22
+#define OPACITY_MASK 0x400000
 static inline uint8_t get_opacity(const css_computed_style *style, css_fixed
 		*fixed)
 {
@@ -1822,8 +1822,8 @@ static inline uint8_t get_opacity(const css_computed_style *style, css_fixed
 #undef OPACITY_MASK
 
 #define ORDER_INDEX 10
-#define ORDER_SHIFT 22
-#define ORDER_MASK 0x400000
+#define ORDER_SHIFT 27
+#define ORDER_MASK 0x8000000
 static inline uint8_t get_order(const css_computed_style *style, int32_t
 		*integer)
 {
@@ -1842,9 +1842,9 @@ static inline uint8_t get_order(const css_computed_style *style, int32_t
 #undef ORDER_SHIFT
 #undef ORDER_MASK
 
-#define OUTLINE_STYLE_INDEX 6
-#define OUTLINE_STYLE_SHIFT 6
-#define OUTLINE_STYLE_MASK 0x3c0
+#define OUTLINE_STYLE_INDEX 1
+#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];
@@ -1860,8 +1860,8 @@ static inline uint8_t get_outline_style(const css_computed_style *style)
 #undef OUTLINE_STYLE_MASK
 
 #define OVERFLOW_X_INDEX 8
-#define OVERFLOW_X_SHIFT 2
-#define OVERFLOW_X_MASK 0x1c
+#define OVERFLOW_X_SHIFT 5
+#define OVERFLOW_X_MASK 0xe0
 static inline uint8_t get_overflow_x(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[OVERFLOW_X_INDEX];
@@ -1877,8 +1877,8 @@ static inline uint8_t get_overflow_x(const css_computed_style *style)
 #undef OVERFLOW_X_MASK
 
 #define OVERFLOW_Y_INDEX 8
-#define OVERFLOW_Y_SHIFT 23
-#define OVERFLOW_Y_MASK 0x3800000
+#define OVERFLOW_Y_SHIFT 29
+#define OVERFLOW_Y_MASK 0xe0000000
 static inline uint8_t get_overflow_y(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[OVERFLOW_Y_INDEX];
@@ -1894,8 +1894,8 @@ static inline uint8_t get_overflow_y(const css_computed_style *style)
 #undef OVERFLOW_Y_MASK
 
 #define PADDING_BOTTOM_INDEX 7
-#define PADDING_BOTTOM_SHIFT 2
-#define PADDING_BOTTOM_MASK 0xfc
+#define PADDING_BOTTOM_SHIFT 20
+#define PADDING_BOTTOM_MASK 0x3f00000
 static inline uint8_t get_padding_bottom(const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
 {
@@ -1916,8 +1916,8 @@ static inline uint8_t get_padding_bottom(const css_computed_style *style,
 #undef PADDING_BOTTOM_MASK
 
 #define PADDING_LEFT_INDEX 7
-#define PADDING_LEFT_SHIFT 20
-#define PADDING_LEFT_MASK 0x3f00000
+#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)
 {
@@ -1938,8 +1938,8 @@ static inline uint8_t get_padding_left(const css_computed_style *style,
 #undef PADDING_LEFT_MASK
 
 #define PADDING_RIGHT_INDEX 7
-#define PADDING_RIGHT_SHIFT 14
-#define PADDING_RIGHT_MASK 0xfc000
+#define PADDING_RIGHT_SHIFT 8
+#define PADDING_RIGHT_MASK 0x3f00
 static inline uint8_t get_padding_right(const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
 {
@@ -1960,8 +1960,8 @@ static inline uint8_t get_padding_right(const css_computed_style *style,
 #undef PADDING_RIGHT_MASK
 
 #define PADDING_TOP_INDEX 7
-#define PADDING_TOP_SHIFT 26
-#define PADDING_TOP_MASK 0xfc000000
+#define PADDING_TOP_SHIFT 14
+#define PADDING_TOP_MASK 0xfc000
 static inline uint8_t get_padding_top(const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
 {
@@ -1981,9 +1981,9 @@ static inline uint8_t get_padding_top(const css_computed_style *style,
 #undef PADDING_TOP_SHIFT
 #undef PADDING_TOP_MASK
 
-#define POSITION_INDEX 8
-#define POSITION_SHIFT 14
-#define POSITION_MASK 0x1c000
+#define POSITION_INDEX 5
+#define POSITION_SHIFT 0
+#define POSITION_MASK 0x7
 static inline uint8_t get_position(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[POSITION_INDEX];
@@ -1999,8 +1999,8 @@ static inline uint8_t get_position(const css_computed_style *style)
 #undef POSITION_MASK
 
 #define QUOTES_INDEX 10
-#define QUOTES_SHIFT 24
-#define QUOTES_MASK 0x1000000
+#define QUOTES_SHIFT 20
+#define QUOTES_MASK 0x100000
 static inline uint8_t get_quotes(const css_computed_style *style, lwc_string
 		***string_arr)
 {
@@ -2017,9 +2017,9 @@ static inline uint8_t get_quotes(const css_computed_style *style, lwc_string
 #undef QUOTES_SHIFT
 #undef QUOTES_MASK
 
-#define RIGHT_INDEX 4
-#define RIGHT_SHIFT 25
-#define RIGHT_MASK 0xfe000000
+#define RIGHT_INDEX 1
+#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)
@@ -2051,8 +2051,8 @@ static inline uint8_t get_right_bits(
 #undef RIGHT_MASK
 
 #define TABLE_LAYOUT_INDEX 9
-#define TABLE_LAYOUT_SHIFT 30
-#define TABLE_LAYOUT_MASK 0xc0000000
+#define TABLE_LAYOUT_SHIFT 0
+#define TABLE_LAYOUT_MASK 0x3
 static inline uint8_t get_table_layout(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[TABLE_LAYOUT_INDEX];
@@ -2067,9 +2067,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 6
-#define TEXT_ALIGN_SHIFT 10
-#define TEXT_ALIGN_MASK 0x3c00
+#define TEXT_ALIGN_INDEX 2
+#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];
@@ -2102,8 +2102,8 @@ static inline uint8_t get_text_decoration(const css_computed_style *style)
 #undef TEXT_DECORATION_MASK
 
 #define TEXT_INDENT_INDEX 7
-#define TEXT_INDENT_SHIFT 8
-#define TEXT_INDENT_MASK 0x3f00
+#define TEXT_INDENT_SHIFT 2
+#define TEXT_INDENT_MASK 0xfc
 static inline uint8_t get_text_indent(const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
 {
@@ -2123,9 +2123,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 8
-#define TEXT_TRANSFORM_SHIFT 29
-#define TEXT_TRANSFORM_MASK 0xe0000000
+#define TEXT_TRANSFORM_INDEX 6
+#define TEXT_TRANSFORM_SHIFT 3
+#define TEXT_TRANSFORM_MASK 0x38
 static inline uint8_t get_text_transform(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[TEXT_TRANSFORM_INDEX];
@@ -2140,9 +2140,9 @@ static inline uint8_t get_text_transform(const css_computed_style *style)
 #undef TEXT_TRANSFORM_SHIFT
 #undef TEXT_TRANSFORM_MASK
 
-#define TOP_INDEX 4
-#define TOP_SHIFT 11
-#define TOP_MASK 0x3f800
+#define TOP_INDEX 3
+#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)
@@ -2174,8 +2174,8 @@ static inline uint8_t get_top_bits(
 #undef TOP_MASK
 
 #define UNICODE_BIDI_INDEX 9
-#define UNICODE_BIDI_SHIFT 4
-#define UNICODE_BIDI_MASK 0x30
+#define UNICODE_BIDI_SHIFT 16
+#define UNICODE_BIDI_MASK 0x30000
 static inline uint8_t get_unicode_bidi(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[UNICODE_BIDI_INDEX];
@@ -2212,9 +2212,9 @@ static inline uint8_t get_vertical_align(const css_computed_style *style,
 #undef VERTICAL_ALIGN_SHIFT
 #undef VERTICAL_ALIGN_MASK
 
-#define VISIBILITY_INDEX 9
-#define VISIBILITY_SHIFT 18
-#define VISIBILITY_MASK 0xc0000
+#define VISIBILITY_INDEX 10
+#define VISIBILITY_SHIFT 28
+#define VISIBILITY_MASK 0x30000000
 static inline uint8_t get_visibility(const css_computed_style *style)
 {
 	uint32_t bits = style->i.bits[VISIBILITY_INDEX];
@@ -2229,7 +2229,7 @@ static inline uint8_t get_visibility(const css_computed_style *style)
 #undef VISIBILITY_SHIFT
 #undef VISIBILITY_MASK
 
-#define WHITE_SPACE_INDEX 5
+#define WHITE_SPACE_INDEX 6
 #define WHITE_SPACE_SHIFT 0
 #define WHITE_SPACE_MASK 0x7
 static inline uint8_t get_white_space(const css_computed_style *style)
@@ -2246,9 +2246,9 @@ static inline uint8_t get_white_space(const css_computed_style *style)
 #undef WHITE_SPACE_SHIFT
 #undef WHITE_SPACE_MASK
 
-#define WIDTH_INDEX 1
-#define WIDTH_SHIFT 11
-#define WIDTH_MASK 0x3f800
+#define WIDTH_INDEX 4
+#define WIDTH_SHIFT 18
+#define WIDTH_MASK 0x1fc0000
 static inline uint8_t get_width(const css_computed_style *style, css_fixed
 		*length, css_unit *unit)
 {
@@ -2268,9 +2268,9 @@ static inline uint8_t get_width(const css_computed_style *style, css_fixed
 #undef WIDTH_SHIFT
 #undef WIDTH_MASK
 
-#define Z_INDEX_INDEX 9
-#define Z_INDEX_SHIFT 24
-#define Z_INDEX_MASK 0x3000000
+#define Z_INDEX_INDEX 10
+#define Z_INDEX_SHIFT 30
+#define Z_INDEX_MASK 0xc0000000
 static inline uint8_t get_z_index(const css_computed_style *style, int32_t
 		*integer)
 {
-- 
cgit v1.2.3