From: Matt Sarett Date: Wed, 8 Mar 2017 18:13:58 +0000 (-0500) Subject: Convert color to dst (once) in color shaders X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~36^2~367 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87345661516731e02c6087bfc8698316b36933fc;p=platform%2Fupstream%2FlibSkiaSharp.git Convert color to dst (once) in color shaders BUG=skia: Change-Id: Ideba16972b82fc26766349c808ae406e5ea23163 Reviewed-on: https://skia-review.googlesource.com/9418 Reviewed-by: Mike Klein Commit-Queue: Matt Sarett --- diff --git a/src/core/SkColorShader.cpp b/src/core/SkColorShader.cpp index 66fc654..94d1abc 100644 --- a/src/core/SkColorShader.cpp +++ b/src/core/SkColorShader.cpp @@ -322,8 +322,7 @@ bool SkColorShader::onAppendStages(SkRasterPipeline* p, const SkMatrix*) const { auto color = scratch->make(SkPM4f_from_SkColor(fColor, dst)); p->append(SkRasterPipeline::constant_color, color); - return append_gamut_transform(p, scratch, - SkColorSpace::MakeSRGB().get(), dst); + return true; } bool SkColor4Shader::onAppendStages(SkRasterPipeline* p, @@ -332,7 +331,7 @@ bool SkColor4Shader::onAppendStages(SkRasterPipeline* p, const SkMatrix&, const SkPaint&, const SkMatrix*) const { - auto color = scratch->make(fColor4.premul()); + auto color = scratch->make(to_colorspace(fColor4, fColorSpace.get(), dst).premul()); p->append(SkRasterPipeline::constant_color, color); - return append_gamut_transform(p, scratch, fColorSpace.get(), dst); + return true; }