From 9d08e2afaef0081cccff69cf292f251c7015f582 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 26 Apr 2018 17:51:46 -0700
Subject: [PATCH] Fabric: Using `ColorComponents` in `colorFromComponents`
 function

Summary: Trivial. We have a special data structure for it, why do not use it here?

Reviewed By: mdvacca

Differential Revision: D7738577

fbshipit-source-id: 750aa649b06f17d27906d44df07172a907cde2e5
---
 ReactCommon/fabric/graphics/Color.cpp                | 12 +++++++++---
 ReactCommon/fabric/graphics/Color.h                  |  2 +-
 .../fabric/graphics/graphicValuesConversions.cpp     |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ReactCommon/fabric/graphics/Color.cpp b/ReactCommon/fabric/graphics/Color.cpp
index ba6c897b4..151e2923a 100644
--- a/ReactCommon/fabric/graphics/Color.cpp
+++ b/ReactCommon/fabric/graphics/Color.cpp
@@ -13,11 +13,17 @@
 namespace facebook {
 namespace react {
 
-SharedColor colorFromComponents(float red, float green, float blue, float alpha) {
-  const CGFloat components[] = {red, green, blue, alpha};
+SharedColor colorFromComponents(ColorComponents components) {
+  const CGFloat componentsArray[] = {
+    components.red,
+    components.green,
+    components.blue,
+    components.alpha
+  };
+
   CGColorRef color = CGColorCreate(
     CGColorSpaceCreateDeviceRGB(),
-    components
+    componentsArray
   );
 
   return SharedColor(color, CFRelease);
diff --git a/ReactCommon/fabric/graphics/Color.h b/ReactCommon/fabric/graphics/Color.h
index 0a84e7b3a..f7622d213 100644
--- a/ReactCommon/fabric/graphics/Color.h
+++ b/ReactCommon/fabric/graphics/Color.h
@@ -23,7 +23,7 @@ struct ColorComponents {
   float alpha {0};
 };
 
-SharedColor colorFromComponents(float red, float green, float blue, float alpha);
+SharedColor colorFromComponents(ColorComponents components);
 ColorComponents colorComponentsFromColor(SharedColor color);
 
 } // namespace react
diff --git a/ReactCommon/fabric/graphics/graphicValuesConversions.cpp b/ReactCommon/fabric/graphics/graphicValuesConversions.cpp
index 85909b3a0..874c70b69 100644
--- a/ReactCommon/fabric/graphics/graphicValuesConversions.cpp
+++ b/ReactCommon/fabric/graphics/graphicValuesConversions.cpp
@@ -36,7 +36,7 @@ SharedColor colorFromDynamic(const folly::dynamic &value) {
     abort();
   }
 
-  return colorFromComponents(red, green, blue, alpha);
+  return colorFromComponents({red, green, blue, alpha});
 }
 
 std::string colorNameFromColor(const SharedColor &value) {