[core] to-color should be idempotent

Ports mapbox/mapbox-gl-js#7260.
mapbox · Sep 13, 2018 · d901713 · d901713
1 parent 6897ac4
commit d901713
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/mbgl/style/expression/coercion.cpp b/src/mbgl/style/expression/coercion.cpp
@@ -30,6 +30,9 @@ EvaluationResult toNumber(const Value& v) {
 
 EvaluationResult toColor(const Value& colorValue) {
     return colorValue.match(
+        [&](const Color& color) -> EvaluationResult {
+            return color;
+        },
         [&](const std::string& colorString) -> EvaluationResult {
             const optional<Color> result = Color::parse(colorString);
             if (result) {