diff options
| author |  reed <reed@google.com> | 2016-10-05 17:33:02 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-10-05 17:33:03 -0700 |
| commit | 374772bd61951f01bf84fe17bf53d8867681c9ae (patch) | |
| tree | ade94be090be12f7503fd35e77c4dae2dc1f0a47 /gm/imagefiltersgraph.cpp | |
| parent | 61c21cdcc31081a1bd4a3a7480b482d135f7df33 (diff) | |
Revert[8] "replace SkXfermode obj with SkBlendMode enum in paints"
This reverts commit c245574ba3d0e2ade6c94b2812de3baa383bf4c4.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2396953002
TBR=
Review-Url: https://codereview.chromium.org/2396953002
Diffstat (limited to 'gm/imagefiltersgraph.cpp')
| -rw-r--r-- | gm/imagefiltersgraph.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index 980398967a..2d27728710 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -69,9 +69,8 @@ protected: sk_sp<SkImageFilter> colorMorph(SkColorFilterImageFilter::Make(std::move(matrixFilter), std::move(morph))); SkPaint paint; - paint.setImageFilter(SkXfermodeImageFilter::Make( - SkXfermode::Make(SkXfermode::kSrcOver_Mode), - std::move(colorMorph))); + paint.setImageFilter(SkXfermodeImageFilter::Make(SkBlendMode::kSrcOver, + std::move(colorMorph))); DrawClippedImage(canvas, fImage.get(), paint); canvas->translate(SkIntToScalar(100), 0); @@ -105,9 +104,8 @@ protected: SkImageFilter::CropRect cropRect(SkRect::MakeWH(SkIntToScalar(95), SkIntToScalar(100))); SkPaint paint; paint.setImageFilter( - SkXfermodeImageFilter::Make(SkXfermode::Make(SkXfermode::kSrcIn_Mode), - std::move(blur), - nullptr, &cropRect)); + SkXfermodeImageFilter::Make(SkBlendMode::kSrcIn, std::move(blur), nullptr, + &cropRect)); DrawClippedImage(canvas, fImage.get(), paint); canvas->translate(SkIntToScalar(100), 0); } |