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 --- bench/RectBench.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bench/RectBench.cpp') diff --git a/bench/RectBench.cpp b/bench/RectBench.cpp index 46a515de29..48764cabdf 100644 --- a/bench/RectBench.cpp +++ b/bench/RectBench.cpp @@ -85,7 +85,7 @@ private: class SrcModeRectBench : public RectBench { public: SrcModeRectBench() : INHERITED(1, 0) { - fMode = SkXfermode::Make(SkXfermode::kSrc_Mode); + fMode = SkBlendMode::kSrc; } protected: @@ -93,7 +93,7 @@ protected: this->INHERITED::setupPaint(paint); // srcmode is most interesting when we're not opaque paint->setAlpha(0x80); - paint->setXfermode(fMode); + paint->setBlendMode(fMode); } const char* onGetName() override { @@ -103,8 +103,8 @@ protected: } private: - SkString fName; - sk_sp fMode; + SkString fName; + SkBlendMode fMode; typedef RectBench INHERITED; }; -- cgit v1.2.3