Remove deprecated drawShadow interfaces

Bug: skia:7263
Change-Id: I90fcc35e8d070b324287139ebecc3d15dbec0137
Reviewed-on: https://skia-review.googlesource.com/109164
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

1 files changed, 17 insertions, 5 deletions

diff --git a/samplecode/SampleShadowColor.cpp b/samplecode/SampleShadowColor.cpp
index 07720ae0a5..337bb28650 100755
--- a/samplecode/SampleShadowColor.cpp
+++ b/samplecode/SampleShadowColor.cpp
@@ -111,10 +111,10 @@ protected:
         }
 
         if (fTwoPassColor) {
-            flags |= SkShadowFlags::kDisableTonalColor_ShadowFlag;
+            SkColor ambientColor = SkColorSetARGB(ambientAlpha*255, 0, 0, 0);
             SkShadowUtils::DrawShadow(canvas, path, zPlaneParams,
                                       lightPos, lightWidth,
-                                      ambientAlpha, 0, SK_ColorBLACK, flags);
+                                      ambientColor, SK_ColorTRANSPARENT, flags);
 
             if (paint.getColor() != SK_ColorBLACK) {
                 SkColor color = paint.getColor();
@@ -126,19 +126,31 @@ protected:
                 SkScalar luminance = 0.5f*(max + min) / 255.f;
                 SkScalar alpha = (.6 - .4*luminance)*luminance*luminance + 0.3f;
                 spotAlpha -= (alpha - 0.3f)*.5f;
+                SkColor spotColor = SkColorSetARGB(alpha*SkColorGetA(color), SkColorGetR(color),
+                                                   SkColorGetG(color), SkColorGetB(color));
 
                 SkShadowUtils::DrawShadow(canvas, path, zPlaneParams,
                                           lightPos, lightWidth,
-                                          0, alpha, paint.getColor(), flags);
+                                          SK_ColorTRANSPARENT, spotColor, flags);
             }
 
+            SkColor spotGreyscale = SkColorSetARGB(spotAlpha * 255, 0, 0, 0);
             SkShadowUtils::DrawShadow(canvas, path, zPlaneParams,
                                       lightPos, lightWidth,
-                                      0, spotAlpha, SK_ColorBLACK, flags);
+                                      SK_ColorTRANSPARENT, spotGreyscale, flags);
         } else {
+            SkColor color = paint.getColor();
+            SkColor baseAmbient = SkColorSetARGB(ambientAlpha*SkColorGetA(color),
+                                                 SkColorGetR(color), SkColorGetG(color),
+                                                 SkColorGetB(color));
+            SkColor baseSpot = SkColorSetARGB(spotAlpha*SkColorGetA(color),
+                                              SkColorGetR(color), SkColorGetG(color),
+                                              SkColorGetB(color));
+            SkColor tonalAmbient, tonalSpot;
+            SkShadowUtils::ComputeTonalColors(baseAmbient, baseSpot, &tonalAmbient, &tonalSpot);
             SkShadowUtils::DrawShadow(canvas, path, zPlaneParams,
                                       lightPos, lightWidth,
-                                      ambientAlpha, spotAlpha, paint.getColor(), flags);
+                                      tonalAmbient, tonalSpot, flags);
         }
         if (fShowObject) {
             canvas->drawPath(path, paint);