Always return ImageShader, even from SkShader::MakeBitmapShader

src/core/SkGlobalInitialization_core.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapProcShader.h"
 #include "SkColorFilter.h"
 #include "SkColorFilterShader.h"
@@ skipping 11 matching lines @@
 #include "SkXfermode.h"
 
 /*
  *  Registers all of the required effects subclasses for picture deserialization.
  *
  *  Optional subclasses (e.g. Blur) should be registered in the ports/ version of this file,
  *  inside the InitEffects() method.
  */
 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)
 
     // PathEffect
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposePathEffect)
 
     // ImageFilter
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixImageFilter)
 
     // ColorFilter
     SkColorFilter::InitializeFlattenables();
 
+    SkShader::InitializeFlattenables();
+
     // Xfermode
     SkXfermode::InitializeFlattenables();
 
     // Drawable
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkRecordedDrawable)
 
     // Now initialize any optional/additional effects (implemented in src/ports)
     InitEffects();
 };
 
 void SkFlattenable::InitializeFlattenablesIfNeeded() {
     static SkOnce once;
     once(SkFlattenable::PrivateInitializer::InitCore);
 }