Always return ImageShader, even from SkShader::MakeBitmapShader

samplecode/SampleLighting.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "DecodeFile.h"
 #include "SampleCode.h"
 #include "Resources.h"
 
@@ skipping 52 matching lines @@
         if (fColorFactor > 1.0f) {
             fColorFactor = 0.0f;
         }
 
         sk_sp<SkLights> lights(create_lights(fLightAngle, fColorFactor));
         SkPaint paint;
         sk_sp<SkShader> normalMap = SkMakeBitmapShader(fNormalBitmap,
             SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, nullptr, nullptr);
         sk_sp<SkNormalSource> normalSource = SkNormalSource::MakeFromNormalMap(
                 std::move(normalMap), SkMatrix::I());
-        sk_sp<SkShader> diffuseShader = SkBitmapProcShader::MakeBitmapShader(fDiffuseBitmap,
+        sk_sp<SkShader> diffuseShader = SkShader::MakeBitmapShader(fDiffuseBitmap,
                 SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, nullptr);
         paint.setShader(SkLightingShader::Make(std::move(diffuseShader), std::move(normalSource),
                                                std::move(lights)));
         paint.setColor(SK_ColorBLACK);
 
         SkRect r = SkRect::MakeWH((SkScalar)fDiffuseBitmap.width(),
                                   (SkScalar)fDiffuseBitmap.height());
         canvas->drawRect(r, paint);
 
         // so we're constantly updating
         this->inval(nullptr);
     }
 
     SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override {
         this->inval(nullptr);
         return this->INHERITED::onFindClickHandler(x, y, modi);
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new LightingView; }
 static SkViewRegister reg(MyFactory);