From 8d1a97e0448044270a7c6b50d78e68162bcf85cc Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 24 Mar 2015 03:48:27 -0700 Subject: Revert of correct reporting of kAlphaUnchanged_Flag in ModeFilter (patchset #1 id:1 of https://codereview.chromium.org/1033583002/) Reason for revert: reverting experiment. need to rebaseilne layouttest svg/css/text-gradient-shadow.svg Original issue's description: > correct reporting of kAlphaUnchanged_Flag in ModeFilter > > BUG=skia: > TBR= > > Committed: https://skia.googlesource.com/skia/+/afced66b508ac4cd3616e2f707db27b7d6f670e1 TBR= NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1026313002 --- src/effects/SkColorFilters.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp index d4723ec18f..8bcd0ebc5d 100644 --- a/src/effects/SkColorFilters.cpp +++ b/src/effects/SkColorFilters.cpp @@ -27,18 +27,7 @@ bool SkModeColorFilter::asColorMode(SkColor* color, SkXfermode::Mode* mode) cons } uint32_t SkModeColorFilter::getFlags() const { - uint32_t flags = 0; - switch (fMode) { - case SkXfermode::kDst_Mode: //!< [Da, Dc] - case SkXfermode::kSrcATop_Mode: //!< [Da, Sc * Da + (1 - Sa) * Dc] - flags |= kAlphaUnchanged_Flag; - default: - break; - } - if (fProc16) { - flags |= kHasFilter16_Flag; - } - return flags; + return fProc16 ? (kAlphaUnchanged_Flag | kHasFilter16_Flag) : 0; } void SkModeColorFilter::filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const { @@ -401,7 +390,7 @@ public: uint32_t getFlags() const SK_OVERRIDE { if (SkGetPackedA32(this->getPMColor()) == 0xFF) { - return kHasFilter16_Flag; + return kAlphaUnchanged_Flag | kHasFilter16_Flag; } else { return 0; } @@ -431,7 +420,7 @@ public: uint32_t getFlags() const SK_OVERRIDE { if (SkGetPackedA32(this->getPMColor()) == 0xFF) { - return kHasFilter16_Flag; + return kAlphaUnchanged_Flag | kHasFilter16_Flag; } else { return 0; } -- cgit v1.2.3