From 9c79d7ec4ee43e256f0e34cabcfdce0fea444b64 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Wed, 23 Mar 2016 14:03:43 -0700 Subject: Revert of Switch SkBlurImageFilter over to new onFilterImage interface (patchset #15 id:270001 of https://codereview.chromium.org/1785643003/ ) Reason for revert: serialize-8888 broken for some reason Original issue's description: > Switch SkBlurImageFilter over to new onFilterImage interface > > This CL relies on: > https://codereview.chromium.org/1787883002/ (Add SkSpecialImage::extractSubset & NewFromPixmap) > https://codereview.chromium.org/1808743003/ (Allow SkGpuDevice::drawSprite to handle subset SkBitmaps) > https://codereview.chromium.org/1813813002/ (Add SkSpecialImage::makeTextureImage entry point) > > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1785643003 > > Committed: https://skia.googlesource.com/skia/+/3c935bc87020bfd19a08922f7394db3a801d168b TBR=senorblanco@google.com,senorblanco@chromium.org,bsalomon@google.com,reed@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1831603002 --- include/core/SkDevice.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'include/core/SkDevice.h') diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index 126f1d2548..cd13d5482e 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -378,12 +378,6 @@ protected: return NULL; } - /** - * Calls through to drawSprite, processing the imagefilter. - */ - virtual void drawBitmapAsSpriteWithImageFilter(const SkDraw&, const SkBitmap&, - int x, int y, const SkPaint&); - private: friend class SkCanvas; friend struct DeviceCM; //for setMatrixClip @@ -394,6 +388,11 @@ private: friend class SkNoPixelsBitmapDevice; friend class SkSurface_Raster; + /** + * Calls through to drawSprite, processing imagefilter as needed. + */ + void drawBitmapAsSprite(const SkDraw&, const SkBitmap&, int x, int y, const SkPaint&); + // used to change the backend's pixels (and possibly config/rowbytes) // but cannot change the width/height, so there should be no change to // any clip information. -- cgit v1.2.3