From 9fa60daad4d5f54c0dbe3dbcc7608a8f6d721187 Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 21 Aug 2014 07:59:51 -0700 Subject: 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 --- include/effects/SkLayerDrawLooper.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'include/effects/SkLayerDrawLooper.h') diff --git a/include/effects/SkLayerDrawLooper.h b/include/effects/SkLayerDrawLooper.h index ac56e288dc..5bb8b6646b 100644 --- a/include/effects/SkLayerDrawLooper.h +++ b/include/effects/SkLayerDrawLooper.h @@ -81,8 +81,14 @@ public: SK_TO_STRING_OVERRIDE() - /// Implements Flattenable. +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING + static SkFlattenable* DeepCreateProc(SkReadBuffer& buffer) { + return CreateProc(buffer); + } + virtual Factory getFactory() const SK_OVERRIDE { return DeepCreateProc; } +#else virtual Factory getFactory() const SK_OVERRIDE { return CreateProc; } +#endif static SkFlattenable* CreateProc(SkReadBuffer& buffer); protected: -- cgit v1.2.3