Revert of Delete SkFlattenable::Type

gm/imagefiltersbase.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkColorFilter.h"
 #include "SkColorPriv.h"
 #include "SkShader.h"
 
 #include "SkBlurImageFilter.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkDropShadowImageFilter.h"
 #include "SkSpecialImage.h"
 #include "SkTestImageFilters.h"
 
 class FailImageFilter : public SkImageFilter {
 public:
     class Registrar {
     public:
         Registrar() {
             SkFlattenable::Register("FailImageFilter",
-                                    FailImageFilter::CreateProc);
+                                    FailImageFilter::CreateProc,
+                                    FailImageFilter::GetFlattenableType());
         }
     };
     static sk_sp<SkImageFilter> Make() {
         return sk_sp<SkImageFilter>(new FailImageFilter);
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter)
 
 protected:
@@ skipping 21 matching lines @@
     str->append(")");
 }
 #endif
 
 class IdentityImageFilter : public SkImageFilter {
 public:
     class Registrar {
     public:
         Registrar() {
             SkFlattenable::Register("IdentityImageFilter",
-                                    IdentityImageFilter::CreateProc);
+                                    IdentityImageFilter::CreateProc,
+                                    IdentityImageFilter::GetFlattenableType());
         }
     };
     static sk_sp<SkImageFilter> Make(sk_sp<SkImageFilter> input) {
         return sk_sp<SkImageFilter>(new IdentityImageFilter(std::move(input)));
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(IdentityImageFilter)
 
 protected:
@@ skipping 237 matching lines @@
 
 class ImageFiltersText_CF : public ImageFiltersTextBaseGM {
 public:
     ImageFiltersText_CF() : ImageFiltersTextBaseGM("color") {}
 
     void installFilter(SkPaint* paint) override {
         paint->setColorFilter(SkColorFilter::MakeModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
     }
 };
 DEF_GM( return new ImageFiltersText_CF; )