diff options
| author | Sven Weidauer <sven@5sw.de> | 2018-01-16 20:47:28 +0100 |
|---|---|---|
| committer | Sven Weidauer <sven@5sw.de> | 2018-01-16 20:47:28 +0100 |
| commit | 7b4163e0216538823630113ed7534c319e19c385 (patch) | |
| tree | fc495db2c19a94061be924d37ca50d2bb1b974e8 /render/font.c | |
| parent | 40ae70a811c23b6ce0bf02a6ecbe9eab098ee52c (diff) | |
| parent | c03405b3b3b28942d50f672e897be5cfc0f6c540 (diff) | |
| download | netsurf-7b4163e0216538823630113ed7534c319e19c385.tar.gz netsurf-7b4163e0216538823630113ed7534c319e19c385.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into svenw/cocoa
Diffstat (limited to 'render/font.c')
| -rw-r--r-- | render/font.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/render/font.c b/render/font.c index 94ef877c7..a769b476f 100644 --- a/render/font.c +++ b/render/font.c @@ -131,8 +131,10 @@ static plot_font_flags_t plot_font_flags(enum css_font_style_e style, } -/* exported function documented in render/font_internal.h */ -void font_plot_style_from_css(const css_computed_style *css, +/* exported function documented in render/font.h */ +void font_plot_style_from_css( + const nscss_len_ctx *len_ctx, + const css_computed_style *css, plot_font_style_t *fstyle) { lwc_string **families; @@ -144,7 +146,7 @@ void font_plot_style_from_css(const css_computed_style *css, css_computed_font_family(css, &families)); css_computed_font_size(css, &length, &unit); - fstyle->size = FIXTOINT(FMUL(nscss_len2pt(length, unit), + fstyle->size = FIXTOINT(FMUL(nscss_len2pt(len_ctx, length, unit), INTTOFIX(FONT_SIZE_SCALE))); /* Clamp font size to configured minimum */ |