Gitweb links:
...log
http://git.netsurf-browser.org/libcss.git/shortlog/55017b90bc6927bf3a4d4056c04b242e1cc6c2ac
...commit
http://git.netsurf-browser.org/libcss.git/commit/55017b90bc6927bf3a4d4056c04b242e1cc6c2ac
...tree
http://git.netsurf-browser.org/libcss.git/tree/55017b90bc6927bf3a4d4056c04b242e1cc6c2ac
The branch, master has been updated
via 55017b90bc6927bf3a4d4056c04b242e1cc6c2ac (commit)
from ecf42afc3329b03ee642ede84f9ba224d2aff1e1 (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/libcss.git/commit/?id=55017b90bc6927bf3a4d4056c04b242e1cc6c2ac
commit 55017b90bc6927bf3a4d4056c04b242e1cc6c2ac
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Squash warning on apple darwin CI.
diff --git a/src/select/unit.c b/src/select/unit.c
index 9129d72..3294db3 100644
--- a/src/select/unit.c
+++ b/src/select/unit.c
@@ -372,17 +372,19 @@ static inline css_hint_length css_unit__get_font_size(
const css_computed_style *style,
css_fixed font_size_default)
{
- css_hint_length size;
+ css_hint_length size = {
+ .value = font_size_default,
+ .unit = CSS_UNIT_PX,
+ };
- if (style == NULL) {
- size.value = font_size_default;
- size.unit = CSS_UNIT_PX;
- } else {
- enum css_font_size_e status = get_font_size(
- style, &size.value, &size.unit);
+ if (style != NULL) {
+ enum css_font_size_e status = get_font_size(style,
+ &size.value,
+ &size.unit);
UNUSED(status);
+ /* The font size must be absolute. */
assert(status == CSS_FONT_SIZE_DIMENSION);
assert(size.unit != CSS_UNIT_EM);
assert(size.unit != CSS_UNIT_EX);
-----------------------------------------------------------------------
Summary of changes:
src/select/unit.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/select/unit.c b/src/select/unit.c
index 9129d72..3294db3 100644
--- a/src/select/unit.c
+++ b/src/select/unit.c
@@ -372,17 +372,19 @@ static inline css_hint_length css_unit__get_font_size(
const css_computed_style *style,
css_fixed font_size_default)
{
- css_hint_length size;
+ css_hint_length size = {
+ .value = font_size_default,
+ .unit = CSS_UNIT_PX,
+ };
- if (style == NULL) {
- size.value = font_size_default;
- size.unit = CSS_UNIT_PX;
- } else {
- enum css_font_size_e status = get_font_size(
- style, &size.value, &size.unit);
+ if (style != NULL) {
+ enum css_font_size_e status = get_font_size(style,
+ &size.value,
+ &size.unit);
UNUSED(status);
+ /* The font size must be absolute. */
assert(status == CSS_FONT_SIZE_DIMENSION);
assert(size.unit != CSS_UNIT_EM);
assert(size.unit != CSS_UNIT_EX);
--
Cascading Style Sheets library
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
