From 5d27aa256fc1778695312fedf21f9489f8232448 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 29 Jan 2011 19:22:12 +0000 Subject: Port to latest libcss svn path=/trunk/netsurf/; revision=11526 --- css/dump.c | 27 --------------------------- css/utils.h | 9 +++++++++ 2 files changed, 9 insertions(+), 27 deletions(-) (limited to 'css') diff --git a/css/dump.c b/css/dump.c index 51289e7be..91d47a61e 100644 --- a/css/dump.c +++ b/css/dump.c @@ -63,9 +63,6 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style) /* background-color */ val = css_computed_background_color(style, &color); switch (val) { - case CSS_BACKGROUND_COLOR_TRANSPARENT: - fprintf(stream, "background-color: transparent "); - break; case CSS_BACKGROUND_COLOR_COLOR: fprintf(stream, "background-color: #%08x ", color); break; @@ -140,12 +137,6 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style) /* border-top-color */ val = css_computed_border_top_color(style, &color); switch (val) { - case CSS_BORDER_COLOR_INITIAL: - fprintf(stream, "border-top-color: initial "); - break; - case CSS_BORDER_COLOR_TRANSPARENT: - fprintf(stream, "border-top-color: transparent "); - break; case CSS_BORDER_COLOR_COLOR: fprintf(stream, "border-top-color: #%08x ", color); break; @@ -156,12 +147,6 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style) /* border-right-color */ val = css_computed_border_right_color(style, &color); switch (val) { - case CSS_BORDER_COLOR_INITIAL: - fprintf(stream, "border-right-color: initial "); - break; - case CSS_BORDER_COLOR_TRANSPARENT: - fprintf(stream, "border-right-color: transparent "); - break; case CSS_BORDER_COLOR_COLOR: fprintf(stream, "border-right-color: #%08x ", color); break; @@ -172,12 +157,6 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style) /* border-bottom-color */ val = css_computed_border_bottom_color(style, &color); switch (val) { - case CSS_BORDER_COLOR_INITIAL: - fprintf(stream, "border-bottom-color: initial "); - break; - case CSS_BORDER_COLOR_TRANSPARENT: - fprintf(stream, "border-bottom-color: transparent "); - break; case CSS_BORDER_COLOR_COLOR: fprintf(stream, "border-bottom-color: #%08x ", color); break; @@ -188,12 +167,6 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style) /* border-left-color */ val = css_computed_border_left_color(style, &color); switch (val) { - case CSS_BORDER_COLOR_INITIAL: - fprintf(stream, "border-left-color: initial "); - break; - case CSS_BORDER_COLOR_TRANSPARENT: - fprintf(stream, "border-left-color: transparent "); - break; case CSS_BORDER_COLOR_COLOR: fprintf(stream, "border-left-color: #%08x ", color); break; diff --git a/css/utils.h b/css/utils.h index 11403b5da..9d40aba7b 100644 --- a/css/utils.h +++ b/css/utils.h @@ -39,6 +39,15 @@ extern css_fixed nscss_screen_dpi; ((color) & 0xff00) | \ (((color) & 0xff) << 16) +/** + * Determine if a CSS color primitive is transparent + * + * \param color The CSS color to consider + * \return True if the color is transparent, false otherwise + */ +#define nscss_color_is_transparent(color) \ + (((color) >> 24) == 0) + 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); -- cgit v1.2.3