diff options
| author |  Jim Van Verth <jvanverth@google.com> | 2018-02-22 10:58:34 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-28 19:07:29 +0000 |
| commit | a556684b10ca2cb5c75c90f831f427400f1ae7ec (patch) | |
| tree | 739f4d3697e818de1306a657a4059369fb506579 /gm/shadowutils.cpp | |
| parent | 0fc07f95bb2cf6c3e5da1c088694eb1b495cbf01 (diff) | |
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>
Diffstat (limited to 'gm/shadowutils.cpp')
| -rw-r--r-- | gm/shadowutils.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/gm/shadowutils.cpp b/gm/shadowutils.cpp index d9cdfd5768..0751174795 100644 --- a/gm/shadowutils.cpp +++ b/gm/shadowutils.cpp @@ -11,12 +11,16 @@ #include "SkResourceCache.h" #include "SkShadowUtils.h" -void draw_shadow(SkCanvas* canvas, const SkPath& path, int height, SkColor color, SkPoint3 lightPos, - SkScalar lightR, bool isAmbient, uint32_t flags) { +void draw_shadow(SkCanvas* canvas, const SkPath& path, SkScalar height, SkColor color, + SkPoint3 lightPos, SkScalar lightR, bool isAmbient, uint32_t flags) { SkScalar ambientAlpha = isAmbient ? .5f : 0.f; SkScalar spotAlpha = isAmbient ? 0.f : .5f; - SkShadowUtils::DrawShadow(canvas, path, height, lightPos, lightR, ambientAlpha, spotAlpha, - color, flags); + SkColor ambientColor = SkColorSetARGB(ambientAlpha*SkColorGetA(color), SkColorGetR(color), + SkColorGetG(color), SkColorGetB(color)); + SkColor spotColor = SkColorSetARGB(spotAlpha*SkColorGetA(color), SkColorGetR(color), + SkColorGetG(color), SkColorGetB(color)); + SkShadowUtils::DrawShadow(canvas, path, SkPoint3{ 0, 0, height}, lightPos, lightR, + ambientColor, spotColor, flags); } static constexpr int kW = 800; @@ -75,14 +79,15 @@ void draw_paths(SkCanvas* canvas, ShadowMode mode) { canvas->concat(m); if (kDebugColorNoOccluders == mode || kDebugColorOccluders == mode) { - flags |= SkShadowFlags::kDisableTonalColor_ShadowFlag; draw_shadow(canvas, path, kHeight, SK_ColorRED, lightPos, kLightR, true, flags); draw_shadow(canvas, path, kHeight, SK_ColorBLUE, lightPos, kLightR, false, flags); } else if (kGrayscale == mode) { - SkShadowUtils::DrawShadow(canvas, path, kHeight, lightPos, kLightR, - 0.1f, 0.25f, SK_ColorBLACK, flags); + SkColor ambientColor = SkColorSetARGB(0.1f * 255, 0, 0, 0); + SkColor spotColor = SkColorSetARGB(0.25f * 255, 0, 0, 0); + SkShadowUtils::DrawShadow(canvas, path, SkPoint3{0, 0, kHeight}, lightPos, + kLightR, ambientColor, spotColor, flags); } SkPaint paint; |