aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/effects/SkMergeImageFilter.h
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2015-10-06 14:05:32 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-10-06 14:05:32 -0700
commit5ea95df02de9cd774d0b84d1341599bbd9c0d8db (patch)
tree55b4fcd9836726d1cea4fe8fe034d8486c72f49f /include/effects/SkMergeImageFilter.h
parent95376a0dde3cdf414eb97a20cef3af19ed7e0151 (diff)
Revert "Revert of factories should return baseclass, allowing the impl to specialize (patchset #4 id:60001 of https://codereview.chromium.org/1390523005/ )"
Diffstat (limited to 'include/effects/SkMergeImageFilter.h')
-rw-r--r--include/effects/SkMergeImageFilter.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
index 714a755021..10c29131ed 100644
--- a/include/effects/SkMergeImageFilter.h
+++ b/include/effects/SkMergeImageFilter.h
@@ -16,16 +16,17 @@ class SK_API SkMergeImageFilter : public SkImageFilter {
public:
virtual ~SkMergeImageFilter();
- static SkMergeImageFilter* Create(SkImageFilter* first, SkImageFilter* second,
- SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode,
- const CropRect* cropRect = NULL) {
+ static SkImageFilter* Create(SkImageFilter* first, SkImageFilter* second,
+ SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode,
+ const CropRect* cropRect = NULL) {
SkImageFilter* inputs[2] = { first, second };
SkXfermode::Mode modes[2] = { mode, mode };
return new SkMergeImageFilter(inputs, 2, modes, cropRect);
}
- static SkMergeImageFilter* Create(SkImageFilter* filters[], int count,
- const SkXfermode::Mode modes[] = NULL,
- const CropRect* cropRect = NULL) {
+
+ static SkImageFilter* Create(SkImageFilter* filters[], int count,
+ const SkXfermode::Mode modes[] = NULL,
+ const CropRect* cropRect = NULL) {
return new SkMergeImageFilter(filters, count, modes, cropRect);
}
@@ -33,16 +34,15 @@ public:
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter)
protected:
- SkMergeImageFilter(SkImageFilter* filters[], int count,
- const SkXfermode::Mode modes[],
- const CropRect* cropRect);
void flatten(SkWriteBuffer&) const override;
-
- virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
- SkBitmap* result, SkIPoint* loc) const override;
+ bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result,
+ SkIPoint* loc) const override;
private:
- uint8_t* fModes; // SkXfermode::Mode
+ SkMergeImageFilter(SkImageFilter* filters[], int count, const SkXfermode::Mode modes[],
+ const CropRect* cropRect);
+
+ uint8_t* fModes; // SkXfermode::Mode
// private storage, to avoid dynamically allocating storage for our copy
// of the modes (unless the count is so large we can't fit).