From ce02e7175872abde3721df9e5d3ec0ab8384cd8e Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 3 Oct 2016 18:02:50 +0000 Subject: Revert "replace SkXfermode obj with SkBlendMode enum in paints" This reverts commit I4fb489ba6b3f77b458f7e4a99f79c7ad10859135. Reason for revert: 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 > Reviewed-by: Brian Salomon > Commit-Queue: Mike Reed > 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 Commit-Queue: Mike Reed --- samplecode/SamplePathClip.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'samplecode/SamplePathClip.cpp') diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp index af9608f0eb..a53fe7186b 100644 --- a/samplecode/SamplePathClip.cpp +++ b/samplecode/SamplePathClip.cpp @@ -225,7 +225,7 @@ protected: // We use a layer, so we can PLUS the different edge-colors, showing where two edges // canceled each other out. canvas->saveLayer(nullptr, nullptr); - p.setBlendMode(SkBlendMode::kPlus); + p.setXfermodeMode(SkXfermode::kPlus_Mode); for (int i = 0; i < N; ++i) { const int j = (i + 1) % N; p.setColor(fEdgeColor[i]); -- cgit v1.2.3