From 6054d686e6fecc7261eeb328f27e9e16cd1d3b1e Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 13 Jan 2016 08:47:54 -0800 Subject: reorg global initialization, separating core from optional Chrome will be changed to just inherit our files, with no need to have their own copy. see https://codereview.chromium.org/1581533007/ BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1580873002 Review URL: https://codereview.chromium.org/1580873002 --- include/core/SkFlattenable.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'include/core') diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h index bccabc18fa..10cba1a2ec 100644 --- a/include/core/SkFlattenable.h +++ b/include/core/SkFlattenable.h @@ -49,7 +49,7 @@ class SkPrivateEffectInitializer; #define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable) \ private: \ static SkFlattenable* CreateProc(SkReadBuffer&); \ - friend class ::SkPrivateEffectInitializer; \ + friend class SkFlattenable::PrivateInitializer; \ public: \ Factory getFactory() const override { return CreateProc; } @@ -108,6 +108,13 @@ public: */ virtual void flatten(SkWriteBuffer&) const {} +protected: + class PrivateInitializer { + public: + static void InitCore(); + static void InitEffects(); + }; + private: static void InitializeFlattenablesIfNeeded(); -- cgit v1.2.3