Remove SK_SUPPORT_LEGACY_DEEPFLATTENING.

include/core/SkFlattenable.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFlattenable_DEFINED
 #define SkFlattenable_DEFINED
 
 #include "SkRefCnt.h"
 
 class SkReadBuffer;
 class SkWriteBuffer;
 
-#define SK_SUPPORT_LEGACY_DEEPFLATTENING
-
 /*
  *  Flattening is straight-forward:
  *      1. call getFactory() so we have a function-ptr to recreate the subclass
  *      2. call flatten(buffer) to write out enough data for the factory to read
  *
  *  Unflattening is easy for the caller: new_instance = factory(buffer)
  *
  *  The complexity of supporting this is as follows.
  *
  *  If your subclass wants to control unflattening, use this macro in your declaration:
@@ skipping 10 matching lines @@
 
 #define SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(flattenable) \
     void flattenable::InitializeFlattenables() {
 
 #define SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END \
     }
 
 #define SK_DECLARE_UNFLATTENABLE_OBJECT() \
     virtual Factory getFactory() const SK_OVERRIDE { return NULL; }
 
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-#define SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(flattenable) \
-    SkFlattenable::Registrar(#flattenable, flattenable::DeepCreateProc, \
-                             flattenable::GetFlattenableType());
-
-#define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable)    \
-    private:                                                                \
-    static SkFlattenable* CreateProc(SkReadBuffer&);                        \
-    static SkFlattenable* DeepCreateProc(SkReadBuffer& buffer) {            \
-        if (NeedsDeepUnflatten(buffer)) {                                   \
-            return SkNEW_ARGS(flattenable, (buffer));                       \
-        }                                                                   \
-        return CreateProc(buffer);                                          \
-    }                                                                       \
-    friend class SkPrivateEffectInitializer;                                \
-    public:                                                                 \
-    virtual Factory getFactory() const SK_OVERRIDE {return DeepCreateProc;}
-#else
 #define SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(flattenable) \
     SkFlattenable::Registrar(#flattenable, flattenable::CreateProc, \
                              flattenable::GetFlattenableType());
 
 #define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable)    \
     private:                                                                \
     static SkFlattenable* CreateProc(SkReadBuffer&);                        \
     friend class SkPrivateEffectInitializer;                                \
     public:                                                                 \
     virtual Factory getFactory() const SK_OVERRIDE { return CreateProc; }
-#endif
 
 // 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
   */
 #define SK_DEFINE_FLATTENABLE_TYPE(flattenable) \
     static Type GetFlattenableType() { \
@@ skipping 50 matching lines @@
         }
     };
 
     /**
      *  Override this if your subclass needs to record data that it will need to recreate itself
      *  from its CreateProc (returned by getFactory()).
      */
     virtual void flatten(SkWriteBuffer&) const {}
 
 protected:
-#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
-    static bool NeedsDeepUnflatten(const SkReadBuffer&);
-    SkFlattenable(SkReadBuffer&) {}
-#endif
-
     static SkFlattenable* ReturnNullCreateProc(SkReadBuffer&) {
         return NULL;
     }
 
 private:
     static void InitializeFlattenablesIfNeeded();
 
     friend class SkGraphics;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif