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, 12 insertions, 3 deletions

diff --git a/gm/tonalshadows.cpp b/gm/tonalshadows.cpp
index 83c1b748e4..9fdcfee683 100644
--- a/gm/tonalshadows.cpp
+++ b/gm/tonalshadows.cpp
@@ -54,13 +54,22 @@ void draw_content(SkCanvas* canvas, BackgroundMode mode) {
         lightPos.fX = 75;
         SkScalar xPos = 75;
         for (int col = 0; col < 10; ++col) {
-            paint.setColor(kColors[10 * row + col]);
+            SkColor color = kColors[10 * row + col];
+            paint.setColor(color);
 
             canvas->save();
             canvas->translate(xPos, yPos);
+
+            SkColor baseAmbient = SkColorSetARGB(kAmbientAlpha*SkColorGetA(color),
+                                                 SkColorGetR(color), SkColorGetG(color),
+                                                 SkColorGetB(color));
+            SkColor baseSpot = SkColorSetARGB(kSpotAlpha*SkColorGetA(color),
+                                              SkColorGetR(color), SkColorGetG(color),
+                                              SkColorGetB(color));
+            SkColor tonalAmbient, tonalSpot;
+            SkShadowUtils::ComputeTonalColors(baseAmbient, baseSpot, &tonalAmbient, &tonalSpot);
             SkShadowUtils::DrawShadow(canvas, path, zPlaneParams,
-                                      lightPos, kLightWidth,
-                                      kAmbientAlpha, kSpotAlpha, paint.getColor(), 0);
+                                      lightPos, kLightWidth, tonalAmbient, tonalSpot);
             canvas->drawPath(path, paint);
             canvas->restore();