diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-10 10:51:58 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-10 10:51:58 +0000 |
| commit | cac5fd597f6e2495f50aaa6bcbe3dadc56f0b977 (patch) | |
| tree | aeeee764feb84da585a469d005bfaf0e4a69bc13 /include/effects/SkXfermodeImageFilter.h | |
| parent | b471a32460a44043e1f00d28cbefc87579dc30c5 (diff) | |
Factory methods for heap-allocated SkImageFilter objects.
This is part of an effort to ensure that all SkPaint effects can only be
allocated on the heap.
This patch makes the constructors of SkImageFilter and its subclasses non-public
and instead provides factory methods for creating these objects on the heap. We
temporarily keep constructor of publicly visible classes public behind a flag.
BUG=skia:2187
R=scroggo@google.com, mtklein@chromium.org, reed@google.com, senorblanco@google.com, senorblanco@chromium.org, bsalomon@google.com, sugoi@chromium.org, zork@chromium.org
Author: dominikg@chromium.org
Review URL: https://codereview.chromium.org/182983003
git-svn-id: http://skia.googlecode.com/svn/trunk@13718 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/effects/SkXfermodeImageFilter.h')
| -rw-r--r-- | include/effects/SkXfermodeImageFilter.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h index 602dc48404..b3872a058c 100644 --- a/include/effects/SkXfermodeImageFilter.h +++ b/include/effects/SkXfermodeImageFilter.h @@ -21,11 +21,14 @@ class SK_API SkXfermodeImageFilter : public SkImageFilter { */ public: - SkXfermodeImageFilter(SkXfermode* mode, SkImageFilter* background, - SkImageFilter* foreground = NULL, const CropRect* cropRect = NULL); - virtual ~SkXfermodeImageFilter(); + static SkXfermodeImageFilter* Create(SkXfermode* mode, SkImageFilter* background, + SkImageFilter* foreground = NULL, + const CropRect* cropRect = NULL) { + return SkNEW_ARGS(SkXfermodeImageFilter, (mode, background, foreground, cropRect)); + } + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkXfermodeImageFilter) virtual bool onFilterImage(Proxy* proxy, @@ -43,6 +46,12 @@ protected: explicit SkXfermodeImageFilter(SkReadBuffer& buffer); virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; +#ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS +public: +#endif + SkXfermodeImageFilter(SkXfermode* mode, SkImageFilter* background, + SkImageFilter* foreground = NULL, const CropRect* cropRect = NULL); + private: SkXfermode* fMode; typedef SkImageFilter INHERITED; |