Changed SkLightingShader API to take in a shader as color source

This CL's base is the CL for the same modification, but in the implementation side: https://codereview.chromium.org/2062703003/

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2064153002

Review-Url: https://codereview.chromium.org/2064153002

1 files changed, 5 insertions, 13 deletions

diff --git a/src/core/SkLightingShader.cpp b/src/core/SkLightingShader.cpp
index 84ec64cc06..02f14b34dd 100644
--- a/src/core/SkLightingShader.cpp
+++ b/src/core/SkLightingShader.cpp
@@ -488,23 +488,15 @@ SkShader::Context* SkLightingShaderImpl::onCreateContext(const ContextRec& rec,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-sk_sp<SkShader> SkLightingShader::Make(const SkBitmap& diffuse,
-                                       sk_sp<SkLights> lights,
-                                       const SkMatrix* diffLocalM,
-                                       sk_sp<SkNormalSource> normalSource) {
-    if (diffuse.isNull() || SkBitmapProcShader::BitmapIsTooBig(diffuse)) {
-        return nullptr;
-    }
-
-    if (!normalSource) {
+sk_sp<SkShader> SkLightingShader::Make(sk_sp<SkShader> diffuseShader,
+                                       sk_sp<SkNormalSource> normalSource,
+                                       sk_sp<SkLights> lights) {
+    if (!diffuseShader || !normalSource) {
+        // TODO: Use paint's color in absence of a diffuseShader
         // TODO: Use a default implementation of normalSource instead
         return nullptr;
     }
 
-    // TODO: support other tile modes
-    sk_sp<SkShader> diffuseShader = SkBitmapProcShader::MakeBitmapShader(diffuse,
-            SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, diffLocalM);
-
     return sk_make_sp<SkLightingShaderImpl>(std::move(diffuseShader), std::move(normalSource),
                                             std::move(lights));
 }