From f7f18042bf00b431dbf2c8a93b0a6d7feb44f0d8 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 2 Oct 2017 17:19:17 +0100 Subject: CSS: Wrappers for computed style getters that return unsupported values. We don't yet handle the Flexbox-related values for certain properties. --- content/handlers/css/dump.c | 7 +++-- content/handlers/css/utils.h | 69 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 3 deletions(-) (limited to 'content') diff --git a/content/handlers/css/dump.c b/content/handlers/css/dump.c index 1ad188cb8..529bd4a88 100644 --- a/content/handlers/css/dump.c +++ b/content/handlers/css/dump.c @@ -20,6 +20,7 @@ #include #include "css/dump.h" +#include "css/utils.h" /** * Dump a fixed point value to the stream in a textual form. @@ -783,7 +784,7 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style) } /* display */ - val = css_computed_display_static(style); + val = ns_computed_display_static(style); switch (val) { case CSS_DISPLAY_INLINE: fprintf(stream, "display: inline "); @@ -1268,7 +1269,7 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style) } /* min-height */ - val = css_computed_min_height(style, &len1, &unit1); + val = ns_computed_min_height(style, &len1, &unit1); switch (val) { case CSS_MIN_HEIGHT_SET: fprintf(stream, "min-height: "); @@ -1282,7 +1283,7 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style) } /* min-width */ - val = css_computed_min_width(style, &len1, &unit1); + val = ns_computed_min_width(style, &len1, &unit1); switch (val) { case CSS_MIN_WIDTH_SET: fprintf(stream, "min-width: "); diff --git a/content/handlers/css/utils.h b/content/handlers/css/utils.h index 58a5ea6e6..21cb4973b 100644 --- a/content/handlers/css/utils.h +++ b/content/handlers/css/utils.h @@ -46,4 +46,73 @@ css_fixed nscss_len2pt(css_fixed length, css_unit unit); */ css_fixed nscss_len2px(css_fixed length, css_unit unit, const css_computed_style *style); + +/** + * Temporary helper wrappers for for libcss computed style getter, while + * we don't support flexbox related property values. + */ + +static inline uint8_t ns_computed_display( + const css_computed_style *style, bool root) +{ + uint8_t value = css_computed_display(style, root); + + if (value == CSS_DISPLAY_FLEX) { + return CSS_DISPLAY_BLOCK; + + } else if (value == CSS_DISPLAY_INLINE_FLEX) { + return CSS_DISPLAY_INLINE_BLOCK; + } + + return value; +} + + +static inline uint8_t ns_computed_display_static( + const css_computed_style *style) +{ + uint8_t value = css_computed_display_static(style); + + if (value == CSS_DISPLAY_FLEX) { + return CSS_DISPLAY_BLOCK; + + } else if (value == CSS_DISPLAY_INLINE_FLEX) { + return CSS_DISPLAY_INLINE_BLOCK; + } + + return value; +} + + +static inline uint8_t ns_computed_min_height( + const css_computed_style *style, + css_fixed *length, css_unit *unit) +{ + uint8_t value = css_computed_min_height(style, length, unit); + + if (value == CSS_MIN_HEIGHT_AUTO) { + value = CSS_MIN_HEIGHT_SET; + *length = 0; + *unit = CSS_UNIT_PX; + } + + return value; +} + + +static inline uint8_t ns_computed_min_width( + const css_computed_style *style, + css_fixed *length, css_unit *unit) +{ + uint8_t value = css_computed_min_width(style, length, unit); + + if (value == CSS_MIN_WIDTH_AUTO) { + value = CSS_MIN_WIDTH_SET; + *length = 0; + *unit = CSS_UNIT_PX; + } + + return value; +} + #endif -- cgit v1.2.3