commit 12956725cced53242a8412c86fd2ce658258c72a
author Mike Klein <mtklein@google.com> Fri Oct 19 10:00:21 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 19 16:18:32 2018 +0000
tree 9d1fa7e15f6e859a68bc631fd97570607a03ba89
parent 2cef6ced1ec00b233944216ab2220f1a9c763cb7

clean up flattenable macro cruft

I'm finding it easier to reason about the code without most of these
macros, but SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY still looks useful.

Adding flattenable:: to CreateProc helps enforce that we pass the
correct type name.  The name is not currently used, but I'd like to.

Change-Id: I87c77eb6020fb3ae4696d8f73d09de62fd814875
Reviewed-on: https://skia-review.googlesource.com/c/163840
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

src/shaders/gradients/SkGradientShader.cpp

diff --git a/src/shaders/gradients/SkGradientShader.cpp b/src/shaders/gradients/SkGradientShader.cpp
index e5801de..9d00708 100644
--- a/src/shaders/gradients/SkGradientShader.cpp
+++ b/src/shaders/gradients/SkGradientShader.cpp
@@ -776,9 +776,9 @@
     return sk_make_sp<SkSweepGradient>(SkPoint::Make(cx, cy), t0, t1, desc);
 }
 
-SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkGradientShader)
+void SkGradientShader::InitializeFlattenables() {
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLinearGradient)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkRadialGradient)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSweepGradient)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTwoPointConicalGradient)
-SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
+}