Changed SkLightingShader API to take in a shader as color source

tests/SerializationTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Resources.h"
 #include "SkAnnotationKeys.h"
 #include "SkBitmapProcShader.h"
@@ skipping 567 matching lines @@
         SkMatrix ctm;
         ctm.setRotate(45);
         SkBitmap normals;
         normals.allocN32Pixels(kTexSize, kTexSize);
 
         sk_tool_utils::create_frustum_normal_map(&normals, SkIRect::MakeWH(kTexSize, kTexSize));
         sk_sp<SkShader> normalMap = SkMakeBitmapShader(normals, SkShader::kClamp_TileMode,
                                                        SkShader::kClamp_TileMode, &matrix, nullptr);
         sk_sp<SkNormalSource> normalSource = SkNormalSource::MakeFromNormalMap(std::move(normalMap),
                                                                                ctm);
-        sk_sp<SkShader> lightingShader = SkLightingShader::Make(diffuse, fLights, &matrix,
-                                                                std::move(normalSource));
+        sk_sp<SkShader> diffuseShader = SkMakeBitmapShader(diffuse, SkShader::kClamp_TileMode,
+                SkShader::kClamp_TileMode, &matrix, nullptr);
+        sk_sp<SkShader> lightingShader = SkLightingShader::Make(std::move(diffuseShader),
+                                                                std::move(normalSource),
+                                                                fLights);
 
         SkAutoTUnref<SkShader>(TestFlattenableSerialization(lightingShader.get(), true, reporter));
         // TODO test equality?
 
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "SkAnnotation.h"
 
@@ skipping 67 matching lines @@
         { r1, SkAnnotationKeys::Define_Named_Dest_Key(),    d1 },
         { r2, SkAnnotationKeys::Link_Named_Dest_Key(),      d2 },
     };
 
     sk_sp<SkPicture> pict0(recorder.finishRecordingAsPicture());
     sk_sp<SkPicture> pict1(copy_picture_via_serialization(pict0.get()));
 
     TestAnnotationCanvas canvas(reporter, recs, SK_ARRAY_COUNT(recs));
     canvas.drawPicture(pict1);
 }