commit a4e4b798a5d46a5acbcb44ef094f626b64d39467
author herb <herb@google.com> Sat Jun 04 13:27:10 2016 -0700
committer Commit bot <commit-bot@chromium.org> Sat Jun 04 13:27:10 2016 -0700
tree f844bf9c7a029350d94cedc139cc5bd9544ba2da
parent 85994fb62e0a0ad6191d30641a35a5e240ae1bd7

Add the ability to handle premul and swizzle src bitmap data.

BUG=skia:5378
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2030953002

Review-Url: https://codereview.chromium.org/2030953002

src/core/SkBitmapProcShader.cpp

diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
index a372b51..f88729e 100644
--- a/src/core/SkBitmapProcShader.cpp
+++ b/src/core/SkBitmapProcShader.cpp
@@ -205,7 +205,10 @@
 static bool choose_linear_pipeline(const SkShader::ContextRec& rec, const SkImageInfo& srcInfo) {
     // If we get here, we can reasonably use either context, respect the caller's preference
     //
-    return SkShader::ContextRec::kPM4f_DstType == rec.fPreferredDstType;
+    bool needsPremul = srcInfo.alphaType() == kUnpremul_SkAlphaType;
+    bool needsSwizzle = srcInfo.bytesPerPixel() == 4 && srcInfo.colorType() != kN32_SkColorType;
+    return SkShader::ContextRec::kPM4f_DstType == rec.fPreferredDstType
+           || needsPremul || needsSwizzle;
 }
 
 size_t SkBitmapProcShader::ContextSize(const ContextRec& rec, const SkImageInfo& srcInfo) {