From 4989d72549b53f751d2999a771e0bc6737015810 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sun, 12 May 2019 16:17:12 +0100 Subject: Computed styles: Drop uncommon extension blocks. They were a space saving feature, but they became largely redundant with computed style sharing. They also made the code complex and buggy in many places. E.g. the cascade, inheritance / composition, and intial values all needed to behave corretly when they, or their parent, had or didn't have an uncommon block. Also, only the uncommon block was really used. Fixes: https://bugs.netsurf-browser.org/mantis/view.php?id=2641 --- src/select/properties/column_width.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/select/properties/column_width.c') diff --git a/src/select/properties/column_width.c b/src/select/properties/column_width.c index b6550ab..e739ade 100644 --- a/src/select/properties/column_width.c +++ b/src/select/properties/column_width.c @@ -41,17 +41,9 @@ 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->i.uncommon == NULL && parent->i.uncommon != NULL) || - type == CSS_COLUMN_WIDTH_INHERIT || - (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); - } - - return set_column_width(result, type, length, unit); + if (type == CSS_COLUMN_WIDTH_INHERIT) { + type = get_column_width(parent, &length, &unit); } - return CSS_OK; + return set_column_width(result, type, length, unit); } - -- cgit v1.2.3