From 70cdb396eb5ffbbed128b902532e9292b5ec0e9d Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 3 Oct 2016 15:44:23 -0400 Subject: Revert "Revert "replace SkXfermode obj with SkBlendMode enum in paints"" This reverts commit ce02e7175872abde3721df9e5d3ec0ab8384cd8e. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2878 Change-Id: I86875511a13497112827cbaed1dbd7639e9e3d10 Reviewed-on: https://skia-review.googlesource.com/2878 Reviewed-by: Matt Sarett Commit-Queue: Mike Reed --- tests/RecordOptsTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/RecordOptsTest.cpp') diff --git a/tests/RecordOptsTest.cpp b/tests/RecordOptsTest.cpp index 4567a01409..b7c9ae96c6 100644 --- a/tests/RecordOptsTest.cpp +++ b/tests/RecordOptsTest.cpp @@ -140,7 +140,7 @@ DEF_TEST(RecordOpts_NoopSaveLayerDrawRestore, r) { SkPaint alphaOnlyLayerPaint, translucentLayerPaint, xfermodeLayerPaint; alphaOnlyLayerPaint.setColor(0x03000000); // Only alpha. translucentLayerPaint.setColor(0x03040506); // Not only alpha. - xfermodeLayerPaint.setXfermodeMode(SkXfermode::kDstIn_Mode); // Any effect will do. + xfermodeLayerPaint.setBlendMode(SkBlendMode::kDstIn); // Any effect will do. SkPaint opaqueDrawPaint, translucentDrawPaint; opaqueDrawPaint.setColor(0xFF020202); // Opaque. @@ -222,10 +222,10 @@ DEF_TEST(RecordOpts_MergeSvgOpacityAndFilterLayers, r) { SkPaint translucentLayerPaint; translucentLayerPaint.setColor(0x03040506); // Not only alpha. SkPaint xfermodePaint; - xfermodePaint.setXfermodeMode(SkXfermode::kDstIn_Mode); + xfermodePaint.setBlendMode(SkBlendMode::kDstIn); SkPaint colorFilterPaint; colorFilterPaint.setColorFilter( - SkColorFilter::MakeModeFilter(SK_ColorLTGRAY, SkXfermode::kSrcIn_Mode)); + SkColorFilter::MakeModeFilter(SK_ColorLTGRAY, SkBlendMode::kSrcIn)); SkPaint opaqueFilterLayerPaint; opaqueFilterLayerPaint.setColor(0xFF020202); // Opaque. @@ -353,7 +353,7 @@ static void do_draw(SkCanvas* canvas, SkColor color, bool doLayer) { if (doLayer) { canvas->saveLayer(nullptr, nullptr); - p.setXfermodeMode(SkXfermode::kSrc_Mode); + p.setBlendMode(SkBlendMode::kSrc); canvas->drawPaint(p); canvas->restore(); } else { -- cgit v1.2.3