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 /samplecode/SampleFilterFuzz.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 'samplecode/SampleFilterFuzz.cpp')
-rw-r--r-- | samplecode/SampleFilterFuzz.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index 755e8fb458..28aa5f4caf 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -157,8 +157,8 @@ static SkMatrix make_matrix() { return m; } -static SkXfermode::Mode make_xfermode() { - return static_cast<SkXfermode::Mode>(R(SkXfermode::kLastMode+1)); +static SkBlendMode make_xfermode() { + return static_cast<SkBlendMode>(R(SkXfermode::kLastMode+1)); } static SkPaint::Align make_paint_align() { @@ -508,7 +508,7 @@ static SkPaint make_paint() { paint.setStrokeCap(make_paint_cap()); paint.setStrokeJoin(make_paint_join()); paint.setColorFilter(make_color_filter()); - paint.setXfermodeMode(make_xfermode()); + paint.setBlendMode(make_xfermode()); paint.setPathEffect(make_path_effect()); paint.setMaskFilter(make_mask_filter()); @@ -558,7 +558,7 @@ static sk_sp<SkImageFilter> make_image_filter(bool canBeNull) { case MERGE: filter = SkMergeImageFilter::Make(make_image_filter(), make_image_filter(), - make_xfermode()); + (SkXfermode::Mode)make_xfermode()); break; case COLOR: { sk_sp<SkColorFilter> cf(make_color_filter()); @@ -585,7 +585,7 @@ static sk_sp<SkImageFilter> make_image_filter(bool canBeNull) { make_image_filter()); break; case XFERMODE: - filter = SkXfermodeImageFilter::Make(SkXfermode::Make(make_xfermode()), + filter = SkXfermodeImageFilter::Make(make_xfermode(), make_image_filter(), make_image_filter(), nullptr); |