Always return ImageShader, even from SkShader::MakeBitmapShader

samplecode/SampleLitAtlas.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 "SampleCode.h"
 #include "SkAnimTimer.h"
 #include "SkBitmapProcShader.h"
@@ skipping 116 matching lines @@
             diffMat.setRectToRect(fDiffTex[i], r, SkMatrix::kFill_ScaleToFit);
             normalMat.setRectToRect(fNormTex[i], r, SkMatrix::kFill_ScaleToFit);
 
             SkMatrix m;
             m.setRSXform(xforms[i]);
 
             sk_sp<SkShader> normalMap = SkMakeBitmapShader(fAtlas, SkShader::kClamp_TileMode,
                     SkShader::kClamp_TileMode, &normalMat, nullptr);
             sk_sp<SkNormalSource> normalSource = SkNormalSource::MakeFromNormalMap(
                     std::move(normalMap), m);
-            sk_sp<SkShader> diffuseShader = SkBitmapProcShader::MakeBitmapShader(fAtlas,
+            sk_sp<SkShader> diffuseShader = SkShader::MakeBitmapShader(fAtlas,
                     SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &diffMat);
             paint.setShader(SkLightingShader::Make(std::move(diffuseShader),
                     std::move(normalSource), fLights));
 
             canvas->save();
                 canvas->setMatrix(m);
                 canvas->drawRect(r, paint);
             canvas->restore();
         }
 #endif
@@ skipping 359 matching lines @@
 private:
     SkAutoTUnref<DrawLitAtlasDrawable> fDrawable;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new DrawLitAtlasView; }
 static SkViewRegister reg(MyFactory);