diff options
author | 2014-08-21 07:59:51 -0700 | |
---|---|---|
committer | 2014-08-21 07:59:51 -0700 | |
commit | 9fa60daad4d5f54c0dbe3dbcc7608a8f6d721187 (patch) | |
tree | 59cc3af7f1a48aec372c05ca29a2fbef703bceb8 /include/effects/SkComposeImageFilter.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/SkComposeImageFilter.h')
-rw-r--r-- | include/effects/SkComposeImageFilter.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h index 068bcab7b8..26eed37872 100644 --- a/include/effects/SkComposeImageFilter.h +++ b/include/effects/SkComposeImageFilter.h @@ -14,7 +14,13 @@ class SK_API SkComposeImageFilter : public SkImageFilter { public: virtual ~SkComposeImageFilter(); - static SkComposeImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) { + static SkImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) { + if (NULL == outer) { + return SkSafeRef(inner); + } + if (NULL == inner) { + return SkRef(outer); + } SkImageFilter* inputs[2] = { outer, inner }; return SkNEW_ARGS(SkComposeImageFilter, (inputs)); } @@ -22,8 +28,13 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) protected: - explicit SkComposeImageFilter(SkImageFilter* inputs[2]) : INHERITED(2, inputs) {} + explicit SkComposeImageFilter(SkImageFilter* inputs[2]) : INHERITED(2, inputs) { + SkASSERT(inputs[0]); + SkASSERT(inputs[1]); + } +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING explicit SkComposeImageFilter(SkReadBuffer& buffer); +#endif virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; |