diff options
author | Michael Drake <michael.drake@codethink.co.uk> | 2021-03-15 17:03:37 +0000 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2021-05-30 11:52:33 +0100 |
commit | 638a408ddee7329f8de2a6e550b7fcc2a4baa4a3 (patch) | |
tree | 2a8100b8d1a8a8d48b130ef1c8e0c1e5792eb5c2 /content/handlers/css/select.c | |
parent | a6e825833d5ad2f79ed12aedbcb75773de52ca43 (diff) | |
download | netsurf-638a408ddee7329f8de2a6e550b7fcc2a4baa4a3.tar.gz netsurf-638a408ddee7329f8de2a6e550b7fcc2a4baa4a3.tar.bz2 |
CSS: Update to latest libcss: Remove weird units.
The 'rlh', 'ic' and 'cap' units were never implemented by anyone.
Diffstat (limited to 'content/handlers/css/select.c')
-rw-r--r-- | content/handlers/css/select.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/content/handlers/css/select.c b/content/handlers/css/select.c index 99840e954..cfefb2a08 100644 --- a/content/handlers/css/select.c +++ b/content/handlers/css/select.c @@ -423,9 +423,7 @@ css_error nscss_compute_font_size(void *pw, const css_hint *parent, size->data.length.unit = parent_size.unit; } else if (size->data.length.unit == CSS_UNIT_EM || size->data.length.unit == CSS_UNIT_EX || - size->data.length.unit == CSS_UNIT_CAP || - size->data.length.unit == CSS_UNIT_CH || - size->data.length.unit == CSS_UNIT_IC) { + size->data.length.unit == CSS_UNIT_CH) { size->data.length.value = FMUL(size->data.length.value, parent_size.value); @@ -435,21 +433,11 @@ css_error nscss_compute_font_size(void *pw, const css_hint *parent, size->data.length.value = FMUL(size->data.length.value, FLTTOFIX(0.6)); break; - case CSS_UNIT_CAP: - /* Height of captals. 1cap = 0.9em in NetSurf. */ - size->data.length.value = FMUL(size->data.length.value, - FLTTOFIX(0.9)); - break; case CSS_UNIT_CH: /* Width of '0'. 1ch = 0.4em in NetSurf. */ size->data.length.value = FMUL(size->data.length.value, FLTTOFIX(0.4)); break; - case CSS_UNIT_IC: - /* Width of U+6C43. 1ic = 1.1em in NetSurf. */ - size->data.length.value = FMUL(size->data.length.value, - FLTTOFIX(1.1)); - break; default: /* No scaling required for EM. */ break; @@ -473,12 +461,6 @@ css_error nscss_compute_font_size(void *pw, const css_hint *parent, size->data.length.value, parent_size.value); } - } else if (size->data.length.unit == CSS_UNIT_RLH) { - /** TODO: Convert root element line-height to absolute value. */ - size->data.length.value = FMUL(size->data.length.value, FDIV( - INTTOFIX(nsoption_int(font_size)), - INTTOFIX(10))); - size->data.length.unit = CSS_UNIT_PT; } size->status = CSS_FONT_SIZE_DIMENSION; |