From 63544a42f69620d503acc75eb3b645686cf2eb7f Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 9 Jun 2017 17:00:25 -0400 Subject: remove unused arithmetic code Bug: skia: Change-Id: I51d382ba8ddb75dff97dd8d773f7a4f3f10663da Reviewed-on: https://skia-review.googlesource.com/19406 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- src/effects/SkArithmeticMode.cpp | 10 ---------- src/effects/SkArithmeticModePriv.h | 5 ----- src/effects/SkXfermodeImageFilter.cpp | 20 ++++++++------------ 3 files changed, 8 insertions(+), 27 deletions(-) (limited to 'src/effects') diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp index 83b2100fe1..0fbce6c530 100644 --- a/src/effects/SkArithmeticMode.cpp +++ b/src/effects/SkArithmeticMode.cpp @@ -29,16 +29,6 @@ public: SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkArithmeticMode_scalar) - // This is used to extract the arithmetic params into an SkArithmeticImageFilter. Afterwards, - // this object is destroyed and arithemtic blending is implemented directly in the image filter. - bool isArithmetic(SkArithmeticParams* params) const override { - if (params) { - memcpy(params->fK, fK, 4 * sizeof(float)); - params->fEnforcePMColor = fEnforcePMColor; - } - return true; - } - private: void flatten(SkWriteBuffer& buffer) const override { SkFAIL("This shouild never be called."); } diff --git a/src/effects/SkArithmeticModePriv.h b/src/effects/SkArithmeticModePriv.h index 4c13a8163e..831410ed6c 100644 --- a/src/effects/SkArithmeticModePriv.h +++ b/src/effects/SkArithmeticModePriv.h @@ -13,11 +13,6 @@ class SkXfermode; -struct SkArithmeticParams { - float fK[4]; - bool fEnforcePMColor; -}; - // This only exists to unflatten instances that were serialized into old pictures as part of // SkXfermodeImageFilter before the advent of SkBlendMode. class SK_API SkArithmeticMode { diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp index dd37611775..ca49f93351 100644 --- a/src/effects/SkXfermodeImageFilter.cpp +++ b/src/effects/SkXfermodeImageFilter.cpp @@ -84,24 +84,20 @@ SkXfermodeImageFilter_Base::SkXfermodeImageFilter_Base(SkBlendMode mode, , fMode(mode) {} -static int unflatten_blendmode(SkReadBuffer& buffer, SkArithmeticParams* arith) { - uint32_t mode = buffer.read32(); +static unsigned unflatten_blendmode(SkReadBuffer& buffer) { + unsigned mode = buffer.read32(); (void)buffer.validate(mode <= (unsigned)SkBlendMode::kLastMode); return mode; } sk_sp SkXfermodeImageFilter_Base::CreateProc(SkReadBuffer& buffer) { SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2); - SkArithmeticParams arith; - int mode = unflatten_blendmode(buffer, &arith); - if (mode >= 0) { - return SkXfermodeImageFilter::Make((SkBlendMode)mode, common.getInput(0), - common.getInput(1), &common.cropRect()); - } else { - return SkArithmeticImageFilter::Make(arith.fK[0], arith.fK[1], arith.fK[2], arith.fK[3], - arith.fEnforcePMColor, common.getInput(0), - common.getInput(1), &common.cropRect()); + unsigned mode = unflatten_blendmode(buffer); + if (!buffer.isValid()) { + return nullptr; } + return SkXfermodeImageFilter::Make((SkBlendMode)mode, common.getInput(0), + common.getInput(1), &common.cropRect()); } void SkXfermodeImageFilter_Base::flatten(SkWriteBuffer& buffer) const { @@ -342,7 +338,7 @@ SkXfermodeImageFilter_Base::makeFGFrag(sk_sp bgFP) const { sk_sp SkXfermodeImageFilter_Base::LegacyArithmeticCreateProc(SkReadBuffer& buffer) { SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2); // skip the unused mode (srcover) field - SkDEBUGCODE(int mode =) unflatten_blendmode(buffer, nullptr); + SkDEBUGCODE(unsigned mode =) unflatten_blendmode(buffer); if (!buffer.isValid()) { return nullptr; } -- cgit v1.2.3