From 0b70f45be88538d31183e4e0c3c6b33f4e82469b Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 23 Dec 2015 19:53:29 -0800 Subject: [PATCH] remove dead flags BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1543323002 TBR= Review URL: https://codereview.chromium.org/1543323002 --- src/core/SkCanvas.cpp | 4 ---- src/effects/SkOffsetImageFilter.cpp | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 68afc187a2..d72ec7ffc9 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -2228,10 +2228,6 @@ void SkCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) { } bool SkCanvas::canDrawBitmapAsSprite(SkScalar x, SkScalar y, int w, int h, const SkPaint& paint) { -#ifdef SK_SUPPORT_LEGACY_LAYER_BITMAP_IMAGEFILTERS - return false; -#endif - if (!paint.getImageFilter()) { return false; } diff --git a/src/effects/SkOffsetImageFilter.cpp b/src/effects/SkOffsetImageFilter.cpp index c4fc5ebe30..e39c8d2506 100644 --- a/src/effects/SkOffsetImageFilter.cpp +++ b/src/effects/SkOffsetImageFilter.cpp @@ -20,11 +20,7 @@ bool SkOffsetImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source, SkIPoint* offset) const { SkBitmap src = source; SkIPoint srcOffset = SkIPoint::Make(0, 0); -#ifdef SK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION - if (false) { -#else if (!cropRectIsSet()) { -#endif if (!this->filterInput(0, proxy, source, ctx, &src, &srcOffset)) { return false; }