diff options
Diffstat (limited to 'src/select/properties')
-rw-r--r-- | src/select/properties/border_spacing.c | 6 | ||||
-rw-r--r-- | src/select/properties/clip.c | 6 | ||||
-rw-r--r-- | src/select/properties/column_count.c | 6 | ||||
-rw-r--r-- | src/select/properties/column_gap.c | 6 | ||||
-rw-r--r-- | src/select/properties/column_width.c | 6 | ||||
-rw-r--r-- | src/select/properties/content.c | 7 | ||||
-rw-r--r-- | src/select/properties/counter_increment.c | 6 | ||||
-rw-r--r-- | src/select/properties/counter_reset.c | 6 | ||||
-rw-r--r-- | src/select/properties/cursor.c | 6 | ||||
-rw-r--r-- | src/select/properties/letter_spacing.c | 6 | ||||
-rw-r--r-- | src/select/properties/outline_color.c | 6 | ||||
-rw-r--r-- | src/select/properties/outline_width.c | 6 | ||||
-rw-r--r-- | src/select/properties/word_spacing.c | 6 |
13 files changed, 40 insertions, 39 deletions
diff --git a/src/select/properties/border_spacing.c b/src/select/properties/border_spacing.c index 1b32747..db7b1f2 100644 --- a/src/select/properties/border_spacing.c +++ b/src/select/properties/border_spacing.c @@ -71,10 +71,10 @@ css_error css__compose_border_spacing(const css_computed_style *parent, uint8_t type = get_border_spacing(child, &hlength, &hunit, &vlength, &vunit); - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_BORDER_SPACING_INHERIT || - (child->uncommon != NULL && result != child)) { - if ((child->uncommon == NULL && parent->uncommon != NULL) || + (child->i.uncommon != NULL && result != child)) { + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_BORDER_SPACING_INHERIT) { type = get_border_spacing(parent, &hlength, &hunit, &vlength, &vunit); diff --git a/src/select/properties/clip.c b/src/select/properties/clip.c index d98c7eb..cc39d99 100644 --- a/src/select/properties/clip.c +++ b/src/select/properties/clip.c @@ -102,10 +102,10 @@ css_error css__compose_clip(const css_computed_style *parent, false, false, false, false }; uint8_t type = get_clip(child, &rect); - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_CLIP_INHERIT || - (child->uncommon != NULL && result != child)) { - if ((child->uncommon == NULL && parent->uncommon != NULL) || + (child->i.uncommon != NULL && result != child)) { + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_CLIP_INHERIT) { type = get_clip(parent, &rect); } diff --git a/src/select/properties/column_count.c b/src/select/properties/column_count.c index 92fdec2..4ded377 100644 --- a/src/select/properties/column_count.c +++ b/src/select/properties/column_count.c @@ -59,10 +59,10 @@ css_error css__compose_column_count(const css_computed_style *parent, int32_t count = 0; uint8_t type = get_column_count(child, &count); - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_COLUMN_COUNT_INHERIT || - (child->uncommon != NULL && result != child)) { - if ((child->uncommon == NULL && parent->uncommon != NULL) || + (child->i.uncommon != NULL && result != child)) { + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_COLUMN_COUNT_INHERIT) { type = get_column_count(parent, &count); } diff --git a/src/select/properties/column_gap.c b/src/select/properties/column_gap.c index 641f529..f544f44 100644 --- a/src/select/properties/column_gap.c +++ b/src/select/properties/column_gap.c @@ -41,10 +41,10 @@ css_error css__compose_column_gap(const css_computed_style *parent, css_unit unit = CSS_UNIT_EM; uint8_t type = get_column_gap(child, &length, &unit); - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_COLUMN_GAP_INHERIT || - (child->uncommon != NULL && result != child)) { - if ((child->uncommon == NULL && parent->uncommon != NULL) || + (child->i.uncommon != NULL && result != child)) { + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_COLUMN_GAP_INHERIT) { type = get_column_gap(parent, &length, &unit); } diff --git a/src/select/properties/column_width.c b/src/select/properties/column_width.c index 45eb7fc..b6550ab 100644 --- a/src/select/properties/column_width.c +++ b/src/select/properties/column_width.c @@ -41,10 +41,10 @@ css_error css__compose_column_width(const css_computed_style *parent, css_unit unit = CSS_UNIT_EM; uint8_t type = get_column_width(child, &length, &unit); - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_COLUMN_WIDTH_INHERIT || - (child->uncommon != NULL && result != child)) { - if ((child->uncommon == NULL && parent->uncommon != NULL) || + (child->i.uncommon != NULL && result != child)) { + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_COLUMN_WIDTH_INHERIT) { type = get_column_width(parent, &length, &unit); } diff --git a/src/select/properties/content.c b/src/select/properties/content.c index c79dd0d..472a66a 100644 --- a/src/select/properties/content.c +++ b/src/select/properties/content.c @@ -49,6 +49,7 @@ css_error css__cascade_content(uint32_t opv, css_style *style, } content = temp; + memset(content + n_contents, 0, sizeof(css_computed_content_item)); switch (v & 0xff) { case CONTENT_COUNTER: @@ -206,13 +207,13 @@ css_error css__compose_content(const css_computed_style *parent, const css_computed_content_item *items = NULL; uint8_t type = get_content(child, &items); - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_CONTENT_INHERIT || - (child->uncommon != NULL && result != child)) { + (child->i.uncommon != NULL && result != child)) { size_t n_items = 0; css_computed_content_item *copy = NULL; - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_CONTENT_INHERIT) { type = get_content(parent, &items); } diff --git a/src/select/properties/counter_increment.c b/src/select/properties/counter_increment.c index 429e558..644607b 100644 --- a/src/select/properties/counter_increment.c +++ b/src/select/properties/counter_increment.c @@ -56,13 +56,13 @@ css_error css__compose_counter_increment(const css_computed_style *parent, const css_computed_counter *items = NULL; uint8_t type = get_counter_increment(child, &items); - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_COUNTER_INCREMENT_INHERIT || - (child->uncommon != NULL && result != child)) { + (child->i.uncommon != NULL && result != child)) { size_t n_items = 0; css_computed_counter *copy = NULL; - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_COUNTER_INCREMENT_INHERIT) { type = get_counter_increment(parent, &items); } diff --git a/src/select/properties/counter_reset.c b/src/select/properties/counter_reset.c index ddf54aa..05559f5 100644 --- a/src/select/properties/counter_reset.c +++ b/src/select/properties/counter_reset.c @@ -55,13 +55,13 @@ css_error css__compose_counter_reset(const css_computed_style *parent, const css_computed_counter *items = NULL; uint8_t type = get_counter_reset(child, &items); - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_COUNTER_RESET_INHERIT || - (child->uncommon != NULL && result != child)) { + (child->i.uncommon != NULL && result != child)) { size_t n_items = 0; css_computed_counter *copy = NULL; - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_COUNTER_RESET_INHERIT) { type = get_counter_reset(parent, &items); } diff --git a/src/select/properties/cursor.c b/src/select/properties/cursor.c index a77d21b..1ca497f 100644 --- a/src/select/properties/cursor.c +++ b/src/select/properties/cursor.c @@ -172,13 +172,13 @@ css_error css__compose_cursor(const css_computed_style *parent, lwc_string **urls = NULL; uint8_t type = get_cursor(child, &urls); - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_CURSOR_INHERIT || - (child->uncommon != NULL && result != child)) { + (child->i.uncommon != NULL && result != child)) { size_t n_urls = 0; lwc_string **copy = NULL; - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_CURSOR_INHERIT) { type = get_cursor(parent, &urls); } diff --git a/src/select/properties/letter_spacing.c b/src/select/properties/letter_spacing.c index 322efef..cc00100 100644 --- a/src/select/properties/letter_spacing.c +++ b/src/select/properties/letter_spacing.c @@ -41,10 +41,10 @@ css_error css__compose_letter_spacing(const css_computed_style *parent, css_unit unit = CSS_UNIT_PX; uint8_t type = get_letter_spacing(child, &length, &unit); - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_LETTER_SPACING_INHERIT || - (child->uncommon != NULL && result != child)) { - if ((child->uncommon == NULL && parent->uncommon != NULL) || + (child->i.uncommon != NULL && result != child)) { + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_LETTER_SPACING_INHERIT) { type = get_letter_spacing(parent, &length, &unit); } diff --git a/src/select/properties/outline_color.c b/src/select/properties/outline_color.c index 36aafd7..2613839 100644 --- a/src/select/properties/outline_color.c +++ b/src/select/properties/outline_color.c @@ -65,10 +65,10 @@ css_error css__compose_outline_color(const css_computed_style *parent, css_color color = 0; uint8_t type = get_outline_color(child, &color); - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_OUTLINE_COLOR_INHERIT || - (child->uncommon != NULL && result != child)) { - if ((child->uncommon == NULL && parent->uncommon != NULL) || + (child->i.uncommon != NULL && result != child)) { + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_OUTLINE_COLOR_INHERIT) { type = get_outline_color(parent, &color); } diff --git a/src/select/properties/outline_width.c b/src/select/properties/outline_width.c index 5380179..547c42a 100644 --- a/src/select/properties/outline_width.c +++ b/src/select/properties/outline_width.c @@ -41,10 +41,10 @@ css_error css__compose_outline_width(const css_computed_style *parent, css_unit unit = CSS_UNIT_PX; uint8_t type = get_outline_width(child, &length, &unit); - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_OUTLINE_WIDTH_INHERIT || - (child->uncommon != NULL && result != child)) { - if ((child->uncommon == NULL && parent->uncommon != NULL) || + (child->i.uncommon != NULL && result != child)) { + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_OUTLINE_WIDTH_INHERIT) { type = get_outline_width(parent, &length, &unit); } diff --git a/src/select/properties/word_spacing.c b/src/select/properties/word_spacing.c index dd4e1d7..24eda89 100644 --- a/src/select/properties/word_spacing.c +++ b/src/select/properties/word_spacing.c @@ -41,10 +41,10 @@ css_error css__compose_word_spacing(const css_computed_style *parent, css_unit unit = CSS_UNIT_PX; uint8_t type = get_word_spacing(child, &length, &unit); - if ((child->uncommon == NULL && parent->uncommon != NULL) || + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_WORD_SPACING_INHERIT || - (child->uncommon != NULL && result != child)) { - if ((child->uncommon == NULL && parent->uncommon != NULL) || + (child->i.uncommon != NULL && result != child)) { + if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) || type == CSS_WORD_SPACING_INHERIT) { type = get_word_spacing(parent, &length, &unit); } |