diff options
author | reed <reed@google.com> | 2014-08-21 07:59:51 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-08-21 07:59:51 -0700 |
commit | 9fa60daad4d5f54c0dbe3dbcc7608a8f6d721187 (patch) | |
tree | 59cc3af7f1a48aec372c05ca29a2fbef703bceb8 /include/effects/SkMagnifierImageFilter.h | |
parent | 5d74806b478a884bd763aee7e3e33cff1c506e50 (diff) |
Simplify flattening to just write enough to call the factory/public-constructor for the class. We want to *not* rely on private constructors, and not rely on calling through the inheritance hierarchy for either flattening or unflattening(CreateProc).
Refactoring pattern:
1. guard the existing constructor(readbuffer) with the legacy build-flag
2. If you are a instancable subclass, implement CreateProc(readbuffer) to create a new instances from the buffer params (or return NULL).
If you're a shader subclass
1. You must read/write the local matrix if your class accepts that in its factory/constructor, else ignore it.
R=robertphillips@google.com, mtklein@google.com, senorblanco@google.com, senorblanco@chromium.org, sugoi@chromium.org
Author: reed@google.com
Review URL: https://codereview.chromium.org/395603002
Diffstat (limited to 'include/effects/SkMagnifierImageFilter.h')
-rw-r--r-- | include/effects/SkMagnifierImageFilter.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h index 3f799d6555..9ea4b37484 100644 --- a/include/effects/SkMagnifierImageFilter.h +++ b/include/effects/SkMagnifierImageFilter.h @@ -14,16 +14,15 @@ class SK_API SkMagnifierImageFilter : public SkImageFilter { public: - static SkMagnifierImageFilter* Create(const SkRect& srcRect, SkScalar inset, - SkImageFilter* input = NULL) { - return SkNEW_ARGS(SkMagnifierImageFilter, (srcRect, inset, input)); - } + static SkImageFilter* Create(const SkRect& src, SkScalar inset, SkImageFilter* input = NULL); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMagnifierImageFilter) protected: SkMagnifierImageFilter(const SkRect& srcRect, SkScalar inset, SkImageFilter* input); +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING explicit SkMagnifierImageFilter(SkReadBuffer& buffer); +#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, |