From 13b77e83076d3735a86926f6f48741e1360c525c Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 22 Feb 2013 16:36:57 +0000 Subject: remove obsolete build flags: SK_IGNORE_TRANS_CLAMP_FIX SK_IGNORE_1XN_BITMAP_OPT SK_IGNORE_CLIP_BUG_FIX SK_IGNORE_FAST_SCALEMATRIX_INVERT SK_IGNORE_QUAD_STROKE_FIX SK_IGNORE_MULTIPLY_XFERMODE_OPT SK_IGNORE_LARGE_DASH_OPT Review URL: https://codereview.appspot.com/7381050 git-svn-id: http://skia.googlecode.com/svn/trunk@7829 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/effects/SkBlendImageFilter.cpp | 25 ------------------------- src/effects/SkDashPathEffect.cpp | 5 ----- 2 files changed, 30 deletions(-) (limited to 'src/effects') diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp index 6da37641f4..c8c4c1bbf2 100644 --- a/src/effects/SkBlendImageFilter.cpp +++ b/src/effects/SkBlendImageFilter.cpp @@ -36,20 +36,6 @@ SkXfermode::Mode modeToXfermode(SkBlendImageFilter::Mode mode) { return SkXfermode::kSrcOver_Mode; } -#ifdef SK_IGNORE_MULTIPLY_XFERMODE_OPT -SkPMColor multiply_proc(SkPMColor src, SkPMColor dst) { - int omsa = 255 - SkGetPackedA32(src); - int sr = SkGetPackedR32(src), sg = SkGetPackedG32(src), sb = SkGetPackedB32(src); - int omda = 255 - SkGetPackedA32(dst); - int dr = SkGetPackedR32(dst), dg = SkGetPackedG32(dst), db = SkGetPackedB32(dst); - int a = 255 - SkMulDiv255Round(omsa, omda); - int r = SkMulDiv255Round(omsa, dr) + SkMulDiv255Round(omda, sr) + SkMulDiv255Round(sr, dr); - int g = SkMulDiv255Round(omsa, dg) + SkMulDiv255Round(omda, sg) + SkMulDiv255Round(sg, dg); - int b = SkMulDiv255Round(omsa, db) + SkMulDiv255Round(omda, sb) + SkMulDiv255Round(sb, db); - return SkPackARGB32(a, r, g, b); -} -#endif - }; /////////////////////////////////////////////////////////////////////////////// @@ -98,18 +84,7 @@ bool SkBlendImageFilter::onFilterImage(Proxy* proxy, SkPaint paint; paint.setXfermodeMode(SkXfermode::kSrc_Mode); canvas.drawBitmap(background, 0, 0, &paint); -#ifdef SK_IGNORE_MULTIPLY_XFERMODE_OPT - // FEBlend's multiply mode is (1 - Sa) * Da + (1 - Da) * Sc + Sc * Dc - // Skia's is just Sc * Dc. So we use a custom proc to implement FEBlend's - // version. - if (fMode == SkBlendImageFilter::kMultiply_Mode) { - paint.setXfermode(new SkProcXfermode(multiply_proc))->unref(); - } else { - paint.setXfermodeMode(modeToXfermode(fMode)); - } -#else paint.setXfermodeMode(modeToXfermode(fMode)); -#endif canvas.drawBitmap(foreground, 0, 0, &paint); return true; } diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp index 10322705e4..a3a011c08c 100644 --- a/src/effects/SkDashPathEffect.cpp +++ b/src/effects/SkDashPathEffect.cpp @@ -230,11 +230,6 @@ private: bool SkDashPathEffect::filterPath(SkPath* dst, const SkPath& src, SkStrokeRec* rec, const SkRect* cullRect) const { - -#ifdef SK_IGNORE_LARGE_DASH_OPT - cullRect = NULL; -#endif - // we do nothing if the src wants to be filled, or if our dashlength is 0 if (rec->isFillStyle() || fInitialDashLength < 0) { return false; -- cgit v1.2.3