aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2015-06-09 06:38:49 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-06-09 06:38:49 -0700
commitded9a6f794a43fc9ec7b370559ba0699c061628d (patch)
treef552463a3ca6d75e6957640c744ea64b6cd4b744
parentc6c6a91ff2356163d9abf9233ff0f025738940f8 (diff)
remove Proxy entrypoints for canHandleFilter
-rw-r--r--include/core/SkImageFilter.h2
-rw-r--r--src/core/SkDeviceImageFilterProxy.h11
2 files changed, 3 insertions, 10 deletions
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index b7cc07ea92..55a504ced2 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -83,8 +83,6 @@ public:
virtual ~Proxy() {};
virtual SkBaseDevice* createDevice(int width, int height) = 0;
- // returns true if the proxy can handle this filter natively
- virtual bool canHandleImageFilter(const SkImageFilter*) = 0;
// returns true if the proxy handled the filter itself. if this returns
// false then the filter's code will be called.
virtual bool filterImage(const SkImageFilter*, const SkBitmap& src,
diff --git a/src/core/SkDeviceImageFilterProxy.h b/src/core/SkDeviceImageFilterProxy.h
index 79ff957564..5d0a61eddf 100644
--- a/src/core/SkDeviceImageFilterProxy.h
+++ b/src/core/SkDeviceImageFilterProxy.h
@@ -31,15 +31,10 @@ public:
}
return dev;
}
- bool canHandleImageFilter(const SkImageFilter* filter) override {
- return fDevice->canHandleImageFilter(filter);
+ bool filterImage(const SkImageFilter* filter, const SkBitmap& src,
+ const SkImageFilter::Context& ctx, SkBitmap* res, SkIPoint* offset) override {
+ return fDevice->filterImage(filter, src, ctx, res, offset);
}
- virtual bool filterImage(const SkImageFilter* filter, const SkBitmap& src,
- const SkImageFilter::Context& ctx,
- SkBitmap* result, SkIPoint* offset) override {
- return fDevice->filterImage(filter, src, ctx, result, offset);
- }
-
const SkSurfaceProps* surfaceProps() const override {
return &fProps;
}