summaryrefslogtreecommitdiff
path: root/src/select/properties/column_count.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/select/properties/column_count.c')
-rw-r--r--src/select/properties/column_count.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/select/properties/column_count.c b/src/select/properties/column_count.c
index 7e929b0..efd1243 100644
--- a/src/select/properties/column_count.c
+++ b/src/select/properties/column_count.c
@@ -59,17 +59,9 @@ 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->i.uncommon == NULL && parent->i.uncommon != NULL) ||
- type == CSS_COLUMN_COUNT_INHERIT ||
- (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);
- }
-
- return set_column_count(result, type, count);
+ if (type == CSS_COLUMN_COUNT_INHERIT) {
+ type = get_column_count(parent, &count);
}
- return CSS_OK;
+ return set_column_count(result, type, count);
}
-