Make skpaint->grpaint flow work for composing draws (verts and atlas)

One side effect is that the SkShader's (or implicit shader's) fragment processor is responsible for the transition from an unpremul paint color to a premul color.

Review URL: https://codereview.chromium.org/1348583002

1 files changed, 1 insertions, 1 deletions

diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
index 2a1c28e0cf..6aadb4301a 100644
--- a/src/core/SkShader.cpp
+++ b/src/core/SkShader.cpp
@@ -335,7 +335,7 @@ SkShader::GradientType SkColorShader::asAGradient(GradientInfo* info) const {
 const GrFragmentProcessor* SkColorShader::asFragmentProcessor(GrContext*, const SkMatrix&,
                                                               const SkMatrix*, SkFilterQuality,
                                                               GrProcessorDataManager*) const {
-    GrColor color = SkColor2GrColor(fColor);
+    GrColor color = SkColorToPremulGrColor(fColor);
     return GrConstColorProcessor::Create(color, GrConstColorProcessor::kModulateA_InputMode);
 }