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

include/core/SkFlattenable.h

Index: include/core/SkFlattenable.h
diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h
index 3cfa85af48787e1636062d8bc44899ac087a89f1..e45627dbcc4210e42217e567d63d6cf6c3f072f9 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();