summaryrefslogtreecommitdiff
path: root/src/select/properties/clip.c
diff options
context:
space:
mode:
authorMichael Drake <Michael Drake tlsa@netsurf-browser.org>2019-05-12 16:17:12 +0100
committerMichael Drake <Michael Drake tlsa@netsurf-browser.org>2019-05-12 16:23:27 +0100
commit4989d72549b53f751d2999a771e0bc6737015810 (patch)
tree744c15bc5403563cc11be3ad1af94a2447b523f2 /src/select/properties/clip.c
parentd09f33131b8079f3886e0827cf458e1fc2c7f2d6 (diff)
downloadlibcss-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/clip.c')
-rw-r--r--src/select/properties/clip.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/select/properties/clip.c b/src/select/properties/clip.c
index fe1dd87..2785afb 100644
--- a/src/select/properties/clip.c
+++ b/src/select/properties/clip.c
@@ -102,17 +102,9 @@ css_error css__compose_clip(const css_computed_style *parent,
false, false, false, false };
uint8_t type = get_clip(child, &rect);
- if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) ||
- type == CSS_CLIP_INHERIT ||
- (child->i.uncommon != NULL && result != child)) {
- if ((child->i.uncommon == NULL && parent->i.uncommon != NULL) ||
- type == CSS_CLIP_INHERIT) {
- type = get_clip(parent, &rect);
- }
-
- return set_clip(result, type, &rect);
+ if (type == CSS_CLIP_INHERIT) {
+ type = get_clip(parent, &rect);
}
- return CSS_OK;
+ return set_clip(result, type, &rect);
}
-