Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/b330fd9f0ef3e923f47537690c3ef05fc55498cd
...commit
http://git.netsurf-browser.org/netsurf.git/commit/b330fd9f0ef3e923f47537690c3ef05fc55498cd
...tree
http://git.netsurf-browser.org/netsurf.git/tree/b330fd9f0ef3e923f47537690c3ef05fc55498cd
The branch, master has been updated
via b330fd9f0ef3e923f47537690c3ef05fc55498cd (commit)
from 31655be43bb6a1eda4f53a6d2a5d5a35c2a89232 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=b330fd9f0ef3e923f47537690c3ef05fc55498cd
commit b330fd9f0ef3e923f47537690c3ef05fc55498cd
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
HTML: Update selection media data for new libcss API.
diff --git a/content/handlers/html/html.c b/content/handlers/html/html.c
index cc3e015..af1040b 100644
--- a/content/handlers/html/html.c
+++ b/content/handlers/html/html.c
@@ -583,10 +583,13 @@ static void html_get_dimensions(html_content *htmlc)
content_broadcast(&htmlc->base, CONTENT_MSG_GETDIMS, &msg_data);
- htmlc->media.width.value = INTTOFIX(w);
- htmlc->media.width.unit = CSS_UNIT_PX;
- htmlc->media.height.value = INTTOFIX(h);
- htmlc->media.height.unit = CSS_UNIT_PX;
+ htmlc->media.width = nscss_pixels_physical_to_css(INTTOFIX(w));
+ htmlc->media.height = nscss_pixels_physical_to_css(INTTOFIX(h));
+ htmlc->media.client_font_size =
+ FDIV(INTTOFIX(nsoption_int(font_size)), F_10);
+ htmlc->media.client_line_height =
+ FMUL(nscss_len2px(NULL, htmlc->media.client_font_size,
+ CSS_UNIT_PT, NULL), FLTTOFIX(1.33));
}
/* exported function documented in html/html_internal.h */
-----------------------------------------------------------------------
Summary of changes:
content/handlers/html/html.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/content/handlers/html/html.c b/content/handlers/html/html.c
index cc3e015..af1040b 100644
--- a/content/handlers/html/html.c
+++ b/content/handlers/html/html.c
@@ -583,10 +583,13 @@ static void html_get_dimensions(html_content *htmlc)
content_broadcast(&htmlc->base, CONTENT_MSG_GETDIMS, &msg_data);
- htmlc->media.width.value = INTTOFIX(w);
- htmlc->media.width.unit = CSS_UNIT_PX;
- htmlc->media.height.value = INTTOFIX(h);
- htmlc->media.height.unit = CSS_UNIT_PX;
+ htmlc->media.width = nscss_pixels_physical_to_css(INTTOFIX(w));
+ htmlc->media.height = nscss_pixels_physical_to_css(INTTOFIX(h));
+ htmlc->media.client_font_size =
+ FDIV(INTTOFIX(nsoption_int(font_size)), F_10);
+ htmlc->media.client_line_height =
+ FMUL(nscss_len2px(NULL, htmlc->media.client_font_size,
+ CSS_UNIT_PT, NULL), FLTTOFIX(1.33));
}
/* exported function documented in html/html_internal.h */
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
