1 files changed, 21 insertions, 9 deletions

diff --git a/src/select/properties/color.c b/src/select/properties/color.c
index 806f2cc..6424436 100644
--- a/src/select/properties/color.c
+++ b/src/select/properties/color.c
@@ -17,11 +17,11 @@
 css_error css__cascade_color(uint32_t opv, css_style *style,
 		css_select_state *state)
 {
-	bool inherit = isInherit(opv);
+	enum flag_value flag_value = getFlagValue(opv);
 	uint16_t value = CSS_COLOR_INHERIT;
 	css_color color = 0;
 
-	if (inherit == false) {
+	if (flag_value == FLAG_VALUE__NONE) {
 		switch (getValue(opv)) {
 		case COLOR_TRANSPARENT:
 			value = CSS_COLOR_COLOR;
@@ -29,7 +29,7 @@ css_error css__cascade_color(uint32_t opv, css_style *style,
 		case COLOR_CURRENT_COLOR:
 			/* color: currentColor always computes to inherit */
 			value = CSS_COLOR_INHERIT;
-			inherit = true;
+			flag_value = FLAG_VALUE_INHERIT;
 			break;
 		case COLOR_SET:
 			value = CSS_COLOR_COLOR;
@@ -40,7 +40,7 @@ css_error css__cascade_color(uint32_t opv, css_style *style,
 	}
 
 	if (css__outranks_existing(getOpcode(opv), isImportant(opv), state,
-			inherit)) {
+			flag_value)) {
 		return set_color(state->computed, value, color);
 	}
 
@@ -66,6 +66,20 @@ css_error css__initial_color(css_select_state *state)
 	return css__set_color_from_hint(&hint, state->computed);
 }
 
+css_error css__copy_color(
+		const css_computed_style *from,
+		css_computed_style *to)
+{
+	css_color color;
+	uint8_t type = get_color(from, &color);
+
+	if (from == to) {
+		return CSS_OK;
+	}
+
+	return set_color(to, type, color);
+}
+
 css_error css__compose_color(const css_computed_style *parent,
 		const css_computed_style *child,
 		css_computed_style *result)
@@ -73,10 +87,8 @@ css_error css__compose_color(const css_computed_style *parent,
 	css_color color;
 	uint8_t type = get_color(child, &color);
 
-	if (type == CSS_COLOR_INHERIT) {
-		type = get_color(parent, &color);
-	}
-
-	return set_color(result, type, color);
+	return css__copy_color(
+			type == CSS_COLOR_INHERIT ? parent : child,
+			result);
 }