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/SkTileImageFilter.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/SkTileImageFilter.h')
| -rw-r--r-- | include/effects/SkTileImageFilter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/effects/SkTileImageFilter.h b/include/effects/SkTileImageFilter.h index 29e3ca571f..084f726e88 100644 --- a/include/effects/SkTileImageFilter.h +++ b/include/effects/SkTileImageFilter.h @@ -20,9 +20,7 @@ public: @param input Input from which the subregion defined by srcRect will be tiled */ static SkTileImageFilter* Create(const SkRect& srcRect, const SkRect& dstRect, - SkImageFilter* input) { - return SkNEW_ARGS(SkTileImageFilter, (srcRect, dstRect, input)); - } + SkImageFilter* input); virtual bool onFilterImage(Proxy* proxy, const SkBitmap& src, const Context& ctx, SkBitmap* dst, SkIPoint* offset) const SK_OVERRIDE; @@ -34,7 +32,9 @@ public: protected: SkTileImageFilter(const SkRect& srcRect, const SkRect& dstRect, SkImageFilter* input) : INHERITED(1, &input), fSrcRect(srcRect), fDstRect(dstRect) {} +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING explicit SkTileImageFilter(SkReadBuffer& buffer); +#endif virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; |