Return color shader instead of 2-color gradient when color count is 1

src/effects/gradients/SkGradientShader.cpp

Index: src/effects/gradients/SkGradientShader.cpp
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index 6ffe56b9d4299d7c80a1312b5a8c0d6c2514e728..5b4d609e9d2c5bb8cb18dc75053bb23a557276b3 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -11,6 +11,7 @@
 #include "SkRadialGradient.h"
 #include "SkTwoPointConicalGradient.h"
 #include "SkSweepGradient.h"
+#include "SkColorShader.h"
 
 void SkGradientShaderBase::Descriptor::flatten(SkWriteBuffer& buffer) const {
     buffer.writeColorArray(fColors, fCount);
@@ -742,18 +743,6 @@ static bool valid_grad(const SkColor colors[], const SkScalar pos[], int count,
     return nullptr != colors && count >= 1 && tileMode < (unsigned)SkShader::kTileModeCount;
 }
 
-// assumes colors is SkColor* and pos is SkScalar*
-#define EXPAND_1_COLOR(count)               \
-    SkColor tmp[2];                         \
-    do {                                    \
-        if (1 == count) {                   \
-            tmp[0] = tmp[1] = colors[0];    \
-            colors = tmp;                   \
-            pos = nullptr;                     \
-            count = 2;                      \
-        }                                   \
-    } while (0)
-
 static void desc_init(SkGradientShaderBase::Descriptor* desc,
                       const SkColor colors[], const SkScalar pos[], int colorCount,
                       SkShader::TileMode mode, uint32_t flags, const SkMatrix* localMatrix) {
@@ -779,7 +768,9 @@ sk_sp<SkShader> SkGradientShader::MakeLinear(const SkPoint pts[2],
     if (!valid_grad(colors, pos, colorCount, mode)) {
         return nullptr;
     }
-    EXPAND_1_COLOR(colorCount);
+    if (1 == colorCount) {
+        return sk_make_sp<SkColorShader>(colors[0]);

[reed1, 2016/08/18 19:20:17]

SkShader::MakeColorShader(colors[0])

+    }
 
     SkGradientShaderBase::Descriptor desc;
     desc_init(&desc, colors, pos, colorCount, mode, flags, localMatrix);
@@ -798,7 +789,9 @@ sk_sp<SkShader> SkGradientShader::MakeRadial(const SkPoint& center, SkScalar rad
     if (!valid_grad(colors, pos, colorCount, mode)) {
         return nullptr;
     }
-    EXPAND_1_COLOR(colorCount);
+    if (1 == colorCount) {
+        return sk_make_sp<SkColorShader>(colors[0]);

[reed1, 2016/08/18 19:20:17]

ditto

+    }
 
     SkGradientShaderBase::Descriptor desc;
     desc_init(&desc, colors, pos, colorCount, mode, flags, localMatrix);
@@ -826,8 +819,9 @@ sk_sp<SkShader> SkGradientShader::MakeTwoPointConical(const SkPoint& start,
             return SkShader::MakeEmptyShader();
         }
     }
-
-    EXPAND_1_COLOR(colorCount);
+    if (1 == colorCount) {
+        return sk_make_sp<SkColorShader>(colors[0]);
+    }
 
     bool flipGradient = startRadius > endRadius;
 
@@ -867,7 +861,9 @@ sk_sp<SkShader> SkGradientShader::MakeSweep(SkScalar cx, SkScalar cy,
     if (!valid_grad(colors, pos, colorCount, SkShader::kClamp_TileMode)) {
         return nullptr;
     }
-    EXPAND_1_COLOR(colorCount);
+    if (1 == colorCount) {
+        return sk_make_sp<SkColorShader>(colors[0]);
+    }
 
     SkGradientShaderBase::Descriptor desc;
     desc_init(&desc, colors, pos, colorCount, SkShader::kClamp_TileMode, flags, localMatrix);