Don't preserve buggy Android behavior of ignoring the paint's alpha.

BUG=skia:4296
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1532573002

Review URL: https://codereview.chromium.org/1532573002
This commit is contained in:
djsollen 2016-01-04 08:16:38 -08:00 committed by Commit bot
parent 7a897c0f79
commit d814c9c314

View File

@ -137,12 +137,6 @@ void SkComposeShader::ComposeShaderContext::shadeSpan(int x, int y, SkPMColor re
SkXfermode* mode = static_cast<const SkComposeShader&>(fShader).fMode;
unsigned scale = SkAlpha255To256(this->getPaintAlpha());
#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
// In the Android framework, make compose shader ignore the paint's alpha.
// This matches the old behavior. FIXME: Can we remove this difference?
scale = 256;
#endif
SkPMColor tmp[TMP_COLOR_COUNT];
if (nullptr == mode) { // implied SRC_OVER