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

1 files changed, 0 insertions, 12 deletions

diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h
index 3cfa85af48..e45627dbcc 100644
--- a/include/core/SkFlattenable.h
+++ b/include/core/SkFlattenable.h
@@ -40,9 +40,6 @@ class SkWriteBuffer;
 #define SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END \
     }
 
-#define SK_DECLARE_UNFLATTENABLE_OBJECT() \
-    virtual Factory getFactory() const SK_OVERRIDE { return NULL; }
-
 #define SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(flattenable) \
     SkFlattenable::Registrar(#flattenable, flattenable::CreateProc, \
                              flattenable::GetFlattenableType());
@@ -54,10 +51,6 @@ class SkWriteBuffer;
     public:                                                                 \
     virtual Factory getFactory() const SK_OVERRIDE { return CreateProc; }
 
-// If your subclass will *never* need to be unflattened, declare this.
-#define SK_DECLARE_NOT_FLATTENABLE_PROCS(flattenable)   \
-    virtual Factory getFactory() const SK_OVERRIDE { return ReturnNullCreateProc; }
-
 /** For SkFlattenable derived objects with a valid type
     This macro should only be used in base class objects in core
   */
@@ -122,11 +115,6 @@ public:
      */
     virtual void flatten(SkWriteBuffer&) const {}
 
-protected:
-    static SkFlattenable* ReturnNullCreateProc(SkReadBuffer&) {
-        return NULL;
-    }
-
 private:
     static void InitializeFlattenablesIfNeeded();