diff options
| author |  Mike Reed <reed@google.com> | 2016-10-04 10:06:20 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-04 20:09:34 +0000 |
| commit | 1834242ec6e3cd62669227d394bc79e1cd66dcfb (patch) | |
| tree | c956e75f272619b5901ca0beab31dbf4a50d9974 /samplecode/SampleFilterFuzz.cpp | |
| parent | 6942442ef7cc018ac136dd379ad6a30902a060e5 (diff) | |
Revert[4] "replace SkXfermode obj with SkBlendMode enum in paints"
This reverts commit 2cbcd12281ee807214df094964c584c78932e10b.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2924
Change-Id: I0fa5c58af428f3da8565465d1219a34ef8417d9a
Reviewed-on: https://skia-review.googlesource.com/2924
Reviewed-by: Mike Reed <reed@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); |