From c245574ba3d0e2ade6c94b2812de3baa383bf4c4 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Wed, 5 Oct 2016 19:59:51 +0000 Subject: Revert[7] "replace SkXfermode obj with SkBlendMode enum in paints" This reverts commit Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8. Reason for revert: new assert from 100K bot Original change's description: > Revert[6] "replace SkXfermode obj with SkBlendMode enum in paints" > > - perform version check in CreateProc for XfermodeImageFilter and ArithmeticImageFilter > This reverts commit 3ed485f4249e17abb4b11f5018d03175fd1afb44. > > BUG=skia: > > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2992 > > Change-Id: Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8 > Reviewed-on: https://skia-review.googlesource.com/2992 > Reviewed-by: Mike Reed > Commit-Queue: Mike Reed > TBR=reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I848e5a69c5cd67f2c14889f4f0a346652578c4ff Reviewed-on: https://skia-review.googlesource.com/3023 Commit-Queue: Mike Reed Reviewed-by: Mike Reed --- gm/lcdblendmodes.cpp | 66 ++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'gm/lcdblendmodes.cpp') diff --git a/gm/lcdblendmodes.cpp b/gm/lcdblendmodes.cpp index a16e219c6b..537c4cbda3 100644 --- a/gm/lcdblendmodes.cpp +++ b/gm/lcdblendmodes.cpp @@ -76,44 +76,44 @@ protected: this->drawColumn(surfCanvas, SK_ColorCYAN, SK_ColorMAGENTA, true); SkPaint surfPaint; - surfPaint.setBlendMode(SkBlendMode::kSrcOver); + surfPaint.setXfermode(SkXfermode::Make(SkXfermode::kSrcOver_Mode)); surface->draw(canvas, 0, 0, &surfPaint); } void drawColumn(SkCanvas* canvas, SkColor backgroundColor, SkColor textColor, bool useGrad) { const struct { - SkBlendMode fMode; - const char* fLabel; + SkXfermode::Mode fMode; + const char* fLabel; } gModes[] = { - { SkBlendMode::kClear, "Clear" }, - { SkBlendMode::kSrc, "Src" }, - { SkBlendMode::kDst, "Dst" }, - { SkBlendMode::kSrcOver, "SrcOver" }, - { SkBlendMode::kDstOver, "DstOver" }, - { SkBlendMode::kSrcIn, "SrcIn" }, - { SkBlendMode::kDstIn, "DstIn" }, - { SkBlendMode::kSrcOut, "SrcOut" }, - { SkBlendMode::kDstOut, "DstOut" }, - { SkBlendMode::kSrcATop, "SrcATop" }, - { SkBlendMode::kDstATop, "DstATop" }, - { SkBlendMode::kXor, "Xor" }, - { SkBlendMode::kPlus, "Plus" }, - { SkBlendMode::kModulate, "Modulate" }, - { SkBlendMode::kScreen, "Screen" }, - { SkBlendMode::kOverlay, "Overlay" }, - { SkBlendMode::kDarken, "Darken" }, - { SkBlendMode::kLighten, "Lighten" }, - { SkBlendMode::kColorDodge, "ColorDodge" }, - { SkBlendMode::kColorBurn, "ColorBurn" }, - { SkBlendMode::kHardLight, "HardLight" }, - { SkBlendMode::kSoftLight, "SoftLight" }, - { SkBlendMode::kDifference, "Difference" }, - { SkBlendMode::kExclusion, "Exclusion" }, - { SkBlendMode::kMultiply, "Multiply" }, - { SkBlendMode::kHue, "Hue" }, - { SkBlendMode::kSaturation, "Saturation" }, - { SkBlendMode::kColor, "Color" }, - { SkBlendMode::kLuminosity, "Luminosity" }, + { SkXfermode::kClear_Mode, "Clear" }, + { SkXfermode::kSrc_Mode, "Src" }, + { SkXfermode::kDst_Mode, "Dst" }, + { SkXfermode::kSrcOver_Mode, "SrcOver" }, + { SkXfermode::kDstOver_Mode, "DstOver" }, + { SkXfermode::kSrcIn_Mode, "SrcIn" }, + { SkXfermode::kDstIn_Mode, "DstIn" }, + { SkXfermode::kSrcOut_Mode, "SrcOut" }, + { SkXfermode::kDstOut_Mode, "DstOut" }, + { SkXfermode::kSrcATop_Mode, "SrcATop" }, + { SkXfermode::kDstATop_Mode, "DstATop" }, + { SkXfermode::kXor_Mode, "Xor" }, + { SkXfermode::kPlus_Mode, "Plus" }, + { SkXfermode::kModulate_Mode, "Modulate" }, + { SkXfermode::kScreen_Mode, "Screen" }, + { SkXfermode::kOverlay_Mode, "Overlay" }, + { SkXfermode::kDarken_Mode, "Darken" }, + { SkXfermode::kLighten_Mode, "Lighten" }, + { SkXfermode::kColorDodge_Mode, "ColorDodge" }, + { SkXfermode::kColorBurn_Mode, "ColorBurn" }, + { SkXfermode::kHardLight_Mode, "HardLight" }, + { SkXfermode::kSoftLight_Mode, "SoftLight" }, + { SkXfermode::kDifference_Mode, "Difference" }, + { SkXfermode::kExclusion_Mode, "Exclusion" }, + { SkXfermode::kMultiply_Mode, "Multiply" }, + { SkXfermode::kHue_Mode, "Hue" }, + { SkXfermode::kSaturation_Mode, "Saturation" }, + { SkXfermode::kColor_Mode, "Color" }, + { SkXfermode::kLuminosity_Mode, "Luminosity" }, }; // Draw background rect SkPaint backgroundPaint; @@ -128,7 +128,7 @@ protected: paint.setSubpixelText(true); paint.setLCDRenderText(true); paint.setTextSize(fTextHeight); - paint.setBlendMode(gModes[m].fMode); + paint.setXfermode(SkXfermode::Make(gModes[m].fMode)); sk_tool_utils::set_portable_typeface(&paint); if (useGrad) { SkRect r; -- cgit v1.2.3