From 2cbcd12281ee807214df094964c584c78932e10b Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 3 Oct 2016 21:34:16 +0000 Subject: Revert "Revert "Revert "replace SkXfermode obj with SkBlendMode enum in paints""" This reverts commit I86875511a13497112827cbaed1dbd7639e9e3d10. legacy (100K) skp failure Original change's description: > 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 > TBR=msarett@google.com,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ife6f0cf3a22b3e8cf885a188f7f44e1ff62e06a5 Reviewed-on: https://skia-review.googlesource.com/2881 Reviewed-by: Mike Reed 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 48764cabdf..46a515de29 100644 --- a/bench/RectBench.cpp +++ b/bench/RectBench.cpp @@ -85,7 +85,7 @@ private: class SrcModeRectBench : public RectBench { public: SrcModeRectBench() : INHERITED(1, 0) { - fMode = SkBlendMode::kSrc; + fMode = SkXfermode::Make(SkXfermode::kSrc_Mode); } protected: @@ -93,7 +93,7 @@ protected: this->INHERITED::setupPaint(paint); // srcmode is most interesting when we're not opaque paint->setAlpha(0x80); - paint->setBlendMode(fMode); + paint->setXfermode(fMode); } const char* onGetName() override { @@ -103,8 +103,8 @@ protected: } private: - SkString fName; - SkBlendMode fMode; + SkString fName; + sk_sp fMode; typedef RectBench INHERITED; }; -- cgit v1.2.3