From 0591897548c8fcb7d53cc94053e01702e58f1ac5 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 3 Oct 2016 12:57:32 -0400 Subject: 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 --- tests/RecordingXfermodeTest.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'tests/RecordingXfermodeTest.cpp') diff --git a/tests/RecordingXfermodeTest.cpp b/tests/RecordingXfermodeTest.cpp index 0f91aea964..32aec36f9f 100644 --- a/tests/RecordingXfermodeTest.cpp +++ b/tests/RecordingXfermodeTest.cpp @@ -34,7 +34,7 @@ class Drawer { const SkImageInfo& imageInfo() const { return fImageInfo; } - void draw(SkCanvas* canvas, const SkRect& clipRect, SkXfermode::Mode mode) const { + void draw(SkCanvas* canvas, const SkRect& clipRect, SkBlendMode mode) const { SkPaint greenPaint; greenPaint.setColor(0xff008000); SkPaint blackPaint; @@ -43,7 +43,7 @@ class Drawer { whitePaint.setColor(0xffffffff); SkPaint layerPaint; layerPaint.setColor(0xff000000); - layerPaint.setXfermodeMode(mode); + layerPaint.setBlendMode(mode); SkRect canvasRect(SkRect::MakeWH(SkIntToScalar(fImageInfo.width()), SkIntToScalar(fImageInfo.height()))); @@ -68,7 +68,7 @@ class RecordingStrategy { virtual ~RecordingStrategy() {} virtual const SkBitmap& recordAndReplay(const Drawer& drawer, const SkRect& intoClip, - SkXfermode::Mode) = 0; + SkBlendMode) = 0; }; class BitmapBackedCanvasStrategy : public RecordingStrategy { @@ -78,9 +78,8 @@ class BitmapBackedCanvasStrategy : public RecordingStrategy { fBitmap.allocPixels(imageInfo); } - virtual const SkBitmap& recordAndReplay(const Drawer& drawer, - const SkRect& intoClip, - SkXfermode::Mode mode) { + const SkBitmap& recordAndReplay(const Drawer& drawer, const SkRect& intoClip, + SkBlendMode mode) override { SkCanvas canvas(fBitmap); canvas.clear(0xffffffff); // Note that the scene is drawn just into the clipped region! @@ -104,9 +103,8 @@ class PictureStrategy : public RecordingStrategy { fHeight = imageInfo.height(); } - virtual const SkBitmap& recordAndReplay(const Drawer& drawer, - const SkRect& intoClip, - SkXfermode::Mode mode) { + const SkBitmap& recordAndReplay(const Drawer& drawer, const SkRect& intoClip, + SkBlendMode mode) override { SkRTreeFactory factory; SkPictureRecorder recorder; SkRect canvasRect(SkRect::MakeWH(SkIntToScalar(fWidth),SkIntToScalar(fHeight))); @@ -144,9 +142,9 @@ DEF_TEST(SkRecordingAccuracyXfermode, reporter) { SkString errors; #endif - for (int iMode = 0; iMode < int(SkXfermode::kLastMode); iMode++) { + for (int iMode = 0; iMode < int(SkBlendMode::kLastMode); iMode++) { const SkRect& clip = SkRect::MakeXYWH(100, 0, 100, 100); - SkXfermode::Mode mode = SkXfermode::Mode(iMode); + SkBlendMode mode = SkBlendMode(iMode); const SkBitmap& goldenBM = golden.recordAndReplay(drawer, clip, mode); const SkBitmap& pictureBM = picture.recordAndReplay(drawer, clip, mode); -- cgit v1.2.3