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 /fuzz | |
| 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 'fuzz')
| -rw-r--r-- | fuzz/FilterFuzz.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fuzz/FilterFuzz.cpp b/fuzz/FilterFuzz.cpp index 6b766a2b7c..e6f9cb31cb 100644 --- a/fuzz/FilterFuzz.cpp +++ b/fuzz/FilterFuzz.cpp @@ -154,8 +154,8 @@ static SkMatrix make_matrix() { return m; } -static SkXfermode::Mode make_xfermode() { - return static_cast<SkXfermode::Mode>(R(SkXfermode::kLastMode+1)); +static SkBlendMode make_blendmode() { + return static_cast<SkBlendMode>(R((int)SkBlendMode::kLastMode+1)); } static SkPaint::Align make_paint_align() { @@ -369,7 +369,7 @@ static sk_sp<SkColorFilter> make_color_filter() { return SkTableColorFilter::MakeARGB(tableA, tableR, tableG, tableB); } case 3: - return SkColorFilter::MakeModeFilter(make_color(), make_xfermode()); + return SkColorFilter::MakeModeFilter(make_color(), (SkXfermode::Mode)make_blendmode()); case 4: return SkColorMatrixFilter::MakeLightingFilter(make_color(), make_color()); case 5: @@ -505,7 +505,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_blendmode()); paint.setPathEffect(make_path_effect()); paint.setMaskFilter(make_mask_filter()); @@ -540,7 +540,7 @@ static sk_sp<SkImageFilter> make_image_filter(bool canBeNull) { } enum { ALPHA_THRESHOLD, MERGE, COLOR, LUT3D, BLUR, MAGNIFIER, - XFERMODE, OFFSET, MATRIX, MATRIX_CONVOLUTION, COMPOSE, + BLENDMODE, OFFSET, MATRIX, MATRIX_CONVOLUTION, COMPOSE, DISTANT_LIGHT, POINT_LIGHT, SPOT_LIGHT, NOISE, DROP_SHADOW, MORPHOLOGY, BITMAP, DISPLACE, TILE, PICTURE, PAINT, NUM_FILTERS }; @@ -554,7 +554,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_blendmode()); break; case COLOR: { sk_sp<SkColorFilter> cf(make_color_filter()); @@ -580,8 +580,8 @@ static sk_sp<SkImageFilter> make_image_filter(bool canBeNull) { make_scalar(true), make_image_filter()); break; - case XFERMODE: - filter = SkXfermodeImageFilter::Make(SkXfermode::Make(make_xfermode()), + case BLENDMODE: + filter = SkXfermodeImageFilter::Make(make_blendmode(), make_image_filter(), make_image_filter(), nullptr); |