diff options
| author | Michael Drake <Michael Drake tlsa@netsurf-browser.org> | 2019-05-12 16:17:12 +0100 |
|---|---|---|
| committer | Michael Drake <Michael Drake tlsa@netsurf-browser.org> | 2019-05-12 16:23:27 +0100 |
| commit | 4989d72549b53f751d2999a771e0bc6737015810 (patch) | |
| tree | 744c15bc5403563cc11be3ad1af94a2447b523f2 /src/select/properties/word_spacing.c | |
| parent | d09f33131b8079f3886e0827cf458e1fc2c7f2d6 (diff) | |
| download | libcss-4989d72549b53f751d2999a771e0bc6737015810.tar.gz libcss-4989d72549b53f751d2999a771e0bc6737015810.tar.bz2 | |
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
Diffstat (limited to 'src/select/properties/word_spacing.c')
| -rw-r--r-- | src/select/properties/word_spacing.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/select/properties/word_spacing.c b/src/select/properties/word_spacing.c index 4cb9422..eb39b50 100644 --- a/src/select/properties/word_spacing.c +++ b/src/select/properties/word_spacing.c @@ -41,17 +41,9 @@ 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->i.uncommon == NULL && parent->i.uncommon != NULL) || - type == CSS_WORD_SPACING_INHERIT || - (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); - } - - return set_word_spacing(result, type, length, unit); + if (type == CSS_WORD_SPACING_INHERIT) { + type = get_word_spacing(parent, &length, &unit); } - return CSS_OK; + return set_word_spacing(result, type, length, unit); } - |