Always return ImageShader, even from SkShader::MakeBitmapShader

src/core/SkGlobalInitialization_core.cpp

Index: src/core/SkGlobalInitialization_core.cpp
diff --git a/src/core/SkGlobalInitialization_core.cpp b/src/core/SkGlobalInitialization_core.cpp
index 022c4972c43c202bc9fc6e041ab186918de632de..21c4d16c4af75a9677aa49f00f50a58560420fa4 100644
--- a/src/core/SkGlobalInitialization_core.cpp
+++ b/src/core/SkGlobalInitialization_core.cpp
@@ -29,13 +29,11 @@
  */
 void SkFlattenable::PrivateInitializer::InitCore() {
     // Shader
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterShader)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorShader)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColor4Shader)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeShader)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmptyShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageShader)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLocalMatrixShader)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureShader)
 
@@ -48,6 +46,8 @@ void SkFlattenable::PrivateInitializer::InitCore() {
     // ColorFilter
     SkColorFilter::InitializeFlattenables();
 
+    SkShader::InitializeFlattenables();
+
     // Xfermode
     SkXfermode::InitializeFlattenables();