diff options
author | 2015-10-06 11:12:23 -0700 | |
---|---|---|
committer | 2015-10-06 11:12:23 -0700 | |
commit | 80a6dcaa1b757826ed7414f64b035d512d9ccbf8 (patch) | |
tree | b77fa8cf50e6954995bf8e53cf0bf07ba72e6544 /include/effects/SkMergeImageFilter.h | |
parent | 85f0d5d6e6a8ae2d5bdfb784fdf426a89dad2c0e (diff) |
factories should return baseclass, allowing the impl to specialize
waiting on https://codereview.chromium.org/1386163002/# to land
BUG=skia:4424
Review URL: https://codereview.chromium.org/1390523005
Diffstat (limited to 'include/effects/SkMergeImageFilter.h')
-rw-r--r-- | include/effects/SkMergeImageFilter.h | 26 |
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). |