diff options
Diffstat (limited to 'gm/emboss.cpp')
| -rw-r--r-- | gm/emboss.cpp | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/gm/emboss.cpp b/gm/emboss.cpp index a8483d0882..c14c9d9278 100644 --- a/gm/emboss.cpp +++ b/gm/emboss.cpp @@ -6,11 +6,11 @@ */ #include "gm.h" -#include "SkBlurMask.h" +#include "SkBlurMaskFilter.h" #include "SkCanvas.h" #include "SkColorFilter.h" -#include "SkEmbossMaskFilter.h" +#ifdef SK_SUPPORT_LEGACY_EMBOSSMASKFILTER static SkBitmap make_bm() { SkBitmap bm; bm.allocN32Pixels(100, 100); @@ -41,36 +41,17 @@ protected: SkPaint paint; SkBitmap bm = make_bm(); canvas->drawBitmap(bm, 10, 10, &paint); - canvas->translate(bm.width() + SkIntToScalar(10), 0); - paint.setMaskFilter(SkEmbossMaskFilter::Make( - SkBlurMask::ConvertRadiusToSigma(3), - { { SK_Scalar1, SK_Scalar1, SK_Scalar1 }, 0, 128, 16*2 })); - canvas->drawBitmap(bm, 10, 10, &paint); + const SkScalar dir[] = { 1, 1, 1 }; + paint.setMaskFilter(SkBlurMaskFilter::MakeEmboss(3, dir, 0.3f, 0.1f)); canvas->translate(bm.width() + SkIntToScalar(10), 0); + canvas->drawBitmap(bm, 10, 10, &paint); // this combination of emboss+colorfilter used to crash -- so we exercise it to // confirm that we have a fix. paint.setColorFilter(SkColorFilter::MakeModeFilter(0xFFFF0000, SkBlendMode::kSrcATop)); - canvas->drawBitmap(bm, 10, 10, &paint); canvas->translate(bm.width() + SkIntToScalar(10), 0); - - paint.setAntiAlias(true); - paint.setStyle(SkPaint::kStroke_Style); - paint.setStrokeWidth(SkIntToScalar(10)); - paint.setMaskFilter(SkEmbossMaskFilter::Make( - SkBlurMask::ConvertRadiusToSigma(4), - { { SK_Scalar1, SK_Scalar1, SK_Scalar1 }, 0, 128, 16*2 })); - paint.setColorFilter(nullptr); - paint.setShader(SkShader::MakeColorShader(SK_ColorBLUE)); - paint.setDither(true); - canvas->drawCircle(SkIntToScalar(50), SkIntToScalar(50), - SkIntToScalar(30), paint); - canvas->translate(SkIntToScalar(100), 0); - - paint.setStyle(SkPaint::kFill_Style); - paint.setTextSize(50); - canvas->drawText("Hello", 5, 0, 50, paint); + canvas->drawBitmap(bm, 10, 10, &paint); } private: @@ -78,3 +59,4 @@ private: }; DEF_GM(return new EmbossGM;) +#endif |