Remove macros that make it look like it's a good idea to not be able to flatten.

There are only a handful of SkFlattenables that are not flattenable.  That
there are any seems highly illogical.  To make this look less like a normal
thing, this removes both macros that marked SkFlattenables as non-flattenable
(in slightly different ways).

The handful of SkFlattenables in our codebase that can't be flattened now
assert violently that they can't be flattened.  They're internal or
part of animator... places where we'll never actually flatten them.

TestLooper and DummyRasterizer were so trivial that I just made them flattenable.

BUG=skia:

Review URL: https://codereview.chromium.org/841753002

2 files changed, 9 insertions, 3 deletions

diff --git a/tests/LayerRasterizerTest.cpp b/tests/LayerRasterizerTest.cpp
index 4b236acd52..b4edc14adc 100644
--- a/tests/LayerRasterizerTest.cpp
+++ b/tests/LayerRasterizerTest.cpp
@@ -33,7 +33,7 @@ public:
 
     static int GetCount() { return gCount; }
 
-    SK_DECLARE_NOT_FLATTENABLE_PROCS(DummyRasterizer)
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(DummyRasterizer);
 
 private:
     static int gCount;
@@ -43,6 +43,10 @@ private:
 
 int DummyRasterizer::gCount;
 
+SkFlattenable* DummyRasterizer::CreateProc(SkReadBuffer&) {
+    return SkNEW(DummyRasterizer);
+}
+
 // Check to make sure that the SkPaint in the layer has its destructor called.
 DEF_TEST(LayerRasterizer_destructor, reporter) {
     {
diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp
index 8f4357e0b0..77bcd3c9b1 100644
--- a/tests/QuickRejectTest.cpp
+++ b/tests/QuickRejectTest.cpp
@@ -28,6 +28,8 @@ public:
     }
 #endif
 
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestLooper);
+
 private:
     class TestDrawLooperContext : public SkDrawLooper::Context {
     public:
@@ -45,10 +47,10 @@ private:
     private:
         bool fOnce;
     };
-
-    SK_DECLARE_UNFLATTENABLE_OBJECT()
 };
 
+SkFlattenable* TestLooper::CreateProc(SkReadBuffer&) { return SkNEW(TestLooper); }
+
 static void test_drawBitmap(skiatest::Reporter* reporter) {
     SkBitmap src;
     src.allocN32Pixels(10, 10);