aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/c
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2016-10-03 18:02:50 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-10-03 18:03:29 +0000
commitce02e7175872abde3721df9e5d3ec0ab8384cd8e (patch)
tree620eec63e1082137df3111d09cd2bf1eb7ebd180 /src/c
parent6fb592e6afb0061c9c0af15ddf599e2903f508f1 (diff)
Revert "replace SkXfermode obj with SkBlendMode enum in paints"
This reverts commit I4fb489ba6b3f77b458f7e4a99f79c7ad10859135. Reason for revert: <INSERT REASONING HERE> Original change's description: > 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> > TBR=bsalomon@google.com,fmalita@chromium.org,fmalita@google.com,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I3e43f79ef5c1709929663fe63cc1f67cd78270b7 Reviewed-on: https://skia-review.googlesource.com/2871 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/c')
-rw-r--r--src/c/sk_paint.cpp63
1 files changed, 31 insertions, 32 deletions
diff --git a/src/c/sk_paint.cpp b/src/c/sk_paint.cpp
index 126170ca4c..f82cd815c1 100644
--- a/src/c/sk_paint.cpp
+++ b/src/c/sk_paint.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "SkBlendMode.h"
#include "SkMaskFilter.h"
#include "SkPaint.h"
#include "SkShader.h"
@@ -133,41 +132,41 @@ void sk_paint_set_stroke_join(sk_paint_t* cpaint, sk_stroke_join_t cjoin) {
void sk_paint_set_xfermode_mode(sk_paint_t* paint, sk_xfermode_mode_t mode) {
SkASSERT(paint);
- SkBlendMode skmode;
+ SkXfermode::Mode skmode;
switch (mode) {
#define MAP(X, Y) case (X): skmode = (Y); break
- MAP( CLEAR_SK_XFERMODE_MODE, SkBlendMode::kClear );
- MAP( SRC_SK_XFERMODE_MODE, SkBlendMode::kSrc );
- MAP( DST_SK_XFERMODE_MODE, SkBlendMode::kDst );
- MAP( SRCOVER_SK_XFERMODE_MODE, SkBlendMode::kSrcOver );
- MAP( DSTOVER_SK_XFERMODE_MODE, SkBlendMode::kDstOver );
- MAP( SRCIN_SK_XFERMODE_MODE, SkBlendMode::kSrcIn );
- MAP( DSTIN_SK_XFERMODE_MODE, SkBlendMode::kDstIn );
- MAP( SRCOUT_SK_XFERMODE_MODE, SkBlendMode::kSrcOut );
- MAP( DSTOUT_SK_XFERMODE_MODE, SkBlendMode::kDstOut );
- MAP( SRCATOP_SK_XFERMODE_MODE, SkBlendMode::kSrcATop );
- MAP( DSTATOP_SK_XFERMODE_MODE, SkBlendMode::kDstATop );
- MAP( XOR_SK_XFERMODE_MODE, SkBlendMode::kXor );
- MAP( PLUS_SK_XFERMODE_MODE, SkBlendMode::kPlus );
- MAP( MODULATE_SK_XFERMODE_MODE, SkBlendMode::kModulate );
- MAP( SCREEN_SK_XFERMODE_MODE, SkBlendMode::kScreen );
- MAP( OVERLAY_SK_XFERMODE_MODE, SkBlendMode::kOverlay );
- MAP( DARKEN_SK_XFERMODE_MODE, SkBlendMode::kDarken );
- MAP( LIGHTEN_SK_XFERMODE_MODE, SkBlendMode::kLighten );
- MAP( COLORDODGE_SK_XFERMODE_MODE, SkBlendMode::kColorDodge );
- MAP( COLORBURN_SK_XFERMODE_MODE, SkBlendMode::kColorBurn );
- MAP( HARDLIGHT_SK_XFERMODE_MODE, SkBlendMode::kHardLight );
- MAP( SOFTLIGHT_SK_XFERMODE_MODE, SkBlendMode::kSoftLight );
- MAP( DIFFERENCE_SK_XFERMODE_MODE, SkBlendMode::kDifference );
- MAP( EXCLUSION_SK_XFERMODE_MODE, SkBlendMode::kExclusion );
- MAP( MULTIPLY_SK_XFERMODE_MODE, SkBlendMode::kMultiply );
- MAP( HUE_SK_XFERMODE_MODE, SkBlendMode::kHue );
- MAP( SATURATION_SK_XFERMODE_MODE, SkBlendMode::kSaturation );
- MAP( COLOR_SK_XFERMODE_MODE, SkBlendMode::kColor );
- MAP( LUMINOSITY_SK_XFERMODE_MODE, SkBlendMode::kLuminosity );
+ MAP( CLEAR_SK_XFERMODE_MODE, SkXfermode::kClear_Mode );
+ MAP( SRC_SK_XFERMODE_MODE, SkXfermode::kSrc_Mode );
+ MAP( DST_SK_XFERMODE_MODE, SkXfermode::kDst_Mode );
+ MAP( SRCOVER_SK_XFERMODE_MODE, SkXfermode::kSrcOver_Mode );
+ MAP( DSTOVER_SK_XFERMODE_MODE, SkXfermode::kDstOver_Mode );
+ MAP( SRCIN_SK_XFERMODE_MODE, SkXfermode::kSrcIn_Mode );
+ MAP( DSTIN_SK_XFERMODE_MODE, SkXfermode::kDstIn_Mode );
+ MAP( SRCOUT_SK_XFERMODE_MODE, SkXfermode::kSrcOut_Mode );
+ MAP( DSTOUT_SK_XFERMODE_MODE, SkXfermode::kDstOut_Mode );
+ MAP( SRCATOP_SK_XFERMODE_MODE, SkXfermode::kSrcATop_Mode );
+ MAP( DSTATOP_SK_XFERMODE_MODE, SkXfermode::kDstATop_Mode );
+ MAP( XOR_SK_XFERMODE_MODE, SkXfermode::kXor_Mode );
+ MAP( PLUS_SK_XFERMODE_MODE, SkXfermode::kPlus_Mode );
+ MAP( MODULATE_SK_XFERMODE_MODE, SkXfermode::kModulate_Mode );
+ MAP( SCREEN_SK_XFERMODE_MODE, SkXfermode::kScreen_Mode );
+ MAP( OVERLAY_SK_XFERMODE_MODE, SkXfermode::kOverlay_Mode );
+ MAP( DARKEN_SK_XFERMODE_MODE, SkXfermode::kDarken_Mode );
+ MAP( LIGHTEN_SK_XFERMODE_MODE, SkXfermode::kLighten_Mode );
+ MAP( COLORDODGE_SK_XFERMODE_MODE, SkXfermode::kColorDodge_Mode );
+ MAP( COLORBURN_SK_XFERMODE_MODE, SkXfermode::kColorBurn_Mode );
+ MAP( HARDLIGHT_SK_XFERMODE_MODE, SkXfermode::kHardLight_Mode );
+ MAP( SOFTLIGHT_SK_XFERMODE_MODE, SkXfermode::kSoftLight_Mode );
+ MAP( DIFFERENCE_SK_XFERMODE_MODE, SkXfermode::kDifference_Mode );
+ MAP( EXCLUSION_SK_XFERMODE_MODE, SkXfermode::kExclusion_Mode );
+ MAP( MULTIPLY_SK_XFERMODE_MODE, SkXfermode::kMultiply_Mode );
+ MAP( HUE_SK_XFERMODE_MODE, SkXfermode::kHue_Mode );
+ MAP( SATURATION_SK_XFERMODE_MODE, SkXfermode::kSaturation_Mode );
+ MAP( COLOR_SK_XFERMODE_MODE, SkXfermode::kColor_Mode );
+ MAP( LUMINOSITY_SK_XFERMODE_MODE, SkXfermode::kLuminosity_Mode );
#undef MAP
default:
return;
}
- AsPaint(paint)->setBlendMode(skmode);
+ AsPaint(paint)->setXfermodeMode(skmode);
}