diff options
| author |  Mike Reed <reed@google.com> | 2016-10-03 12:57:32 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-03 17:17:10 +0000 |
| commit | 0591897548c8fcb7d53cc94053e01702e58f1ac5 (patch) | |
| tree | 099bf31c7bf4bd3062d2e7a8b4268a89f1fd61a2 /gm/lcdoverlap.cpp | |
| parent | a224bb7027f022cf78376cb7afa2fff83d59153e (diff) | |
replace SkXfermode obj with SkBlendMode enum in paints
BUG=skia:5814
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2714
Change-Id: I4fb489ba6b3f77b458f7e4a99f79c7ad10859135
Reviewed-on: https://skia-review.googlesource.com/2714
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'gm/lcdoverlap.cpp')
| -rw-r--r-- | gm/lcdoverlap.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/gm/lcdoverlap.cpp b/gm/lcdoverlap.cpp index 623d74622d..380878539f 100644 --- a/gm/lcdoverlap.cpp +++ b/gm/lcdoverlap.cpp @@ -49,8 +49,8 @@ protected: SkISize onISize() override { return SkISize::Make(kWidth, kHeight); } - void drawTestCase(SkCanvas* canvas, SkScalar x, SkScalar y, SkXfermode::Mode mode, - SkXfermode::Mode mode2) { + void drawTestCase(SkCanvas* canvas, SkScalar x, SkScalar y, SkBlendMode mode, + SkBlendMode mode2) { const SkColor colors[] { SK_ColorRED, SK_ColorGREEN, @@ -60,8 +60,6 @@ protected: SK_ColorMAGENTA, }; - sk_sp<SkXfermode> xfermode(SkXfermode::Make(mode)); - sk_sp<SkXfermode> xfermode2(SkXfermode::Make(mode2)); for (size_t i = 0; i < SK_ARRAY_COUNT(colors); i++) { canvas->save(); canvas->translate(x, y); @@ -70,7 +68,7 @@ protected: SkPaint textPaint; textPaint.setColor(colors[i]); - textPaint.setXfermode(i % 2 == 0 ? xfermode : xfermode2); + textPaint.setBlendMode(i % 2 == 0 ? mode : mode2); canvas->drawTextBlob(fBlob, 0, 0, textPaint); canvas->restore(); } @@ -79,13 +77,11 @@ protected: void onDraw(SkCanvas* canvas) override { SkScalar offsetX = kWidth / 4.0f; SkScalar offsetY = kHeight / 4.0f; - drawTestCase(canvas, offsetX, offsetY, SkXfermode::kSrc_Mode, SkXfermode::kSrc_Mode); - drawTestCase(canvas, 3 * offsetX, offsetY, SkXfermode::kSrcOver_Mode, - SkXfermode::kSrcOver_Mode); - drawTestCase(canvas, offsetX, 3 * offsetY, SkXfermode::kHardLight_Mode, - SkXfermode::kLuminosity_Mode); - drawTestCase(canvas, 3 * offsetX, 3 * offsetY, SkXfermode::kSrcOver_Mode, - SkXfermode::kSrc_Mode); + drawTestCase(canvas, offsetX, offsetY, SkBlendMode::kSrc, SkBlendMode::kSrc); + drawTestCase(canvas, 3 * offsetX, offsetY, SkBlendMode::kSrcOver, SkBlendMode::kSrcOver); + drawTestCase(canvas, offsetX, 3 * offsetY, SkBlendMode::kHardLight, + SkBlendMode::kLuminosity); + drawTestCase(canvas, 3 * offsetX, 3 * offsetY, SkBlendMode::kSrcOver, SkBlendMode::kSrc); } private: |