diff options
author | Mike Reed <reed@google.com> | 2016-10-05 19:59:51 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-05 20:20:14 +0000 |
commit | c245574ba3d0e2ade6c94b2812de3baa383bf4c4 (patch) | |
tree | e008f8500d56d8487a2941cb217c5ff8d1151dcf /tests/RecordingXfermodeTest.cpp | |
parent | 62f6856ebe003743192508653914b5e01ffcc857 (diff) |
Revert[7] "replace SkXfermode obj with SkBlendMode enum in paints"
This reverts commit Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8.
Reason for revert: new assert from 100K bot
Original change's description:
> Revert[6] "replace SkXfermode obj with SkBlendMode enum in paints"
>
> - perform version check in CreateProc for XfermodeImageFilter and ArithmeticImageFilter
> This reverts commit 3ed485f4249e17abb4b11f5018d03175fd1afb44.
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2992
>
> Change-Id: Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8
> Reviewed-on: https://skia-review.googlesource.com/2992
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I848e5a69c5cd67f2c14889f4f0a346652578c4ff
Reviewed-on: https://skia-review.googlesource.com/3023
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/RecordingXfermodeTest.cpp')
-rw-r--r-- | tests/RecordingXfermodeTest.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/RecordingXfermodeTest.cpp b/tests/RecordingXfermodeTest.cpp index 32aec36f9f..0f91aea964 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, SkBlendMode mode) const { + void draw(SkCanvas* canvas, const SkRect& clipRect, SkXfermode::Mode mode) const { SkPaint greenPaint; greenPaint.setColor(0xff008000); SkPaint blackPaint; @@ -43,7 +43,7 @@ class Drawer { whitePaint.setColor(0xffffffff); SkPaint layerPaint; layerPaint.setColor(0xff000000); - layerPaint.setBlendMode(mode); + layerPaint.setXfermodeMode(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, - SkBlendMode) = 0; + SkXfermode::Mode) = 0; }; class BitmapBackedCanvasStrategy : public RecordingStrategy { @@ -78,8 +78,9 @@ class BitmapBackedCanvasStrategy : public RecordingStrategy { fBitmap.allocPixels(imageInfo); } - const SkBitmap& recordAndReplay(const Drawer& drawer, const SkRect& intoClip, - SkBlendMode mode) override { + virtual const SkBitmap& recordAndReplay(const Drawer& drawer, + const SkRect& intoClip, + SkXfermode::Mode mode) { SkCanvas canvas(fBitmap); canvas.clear(0xffffffff); // Note that the scene is drawn just into the clipped region! @@ -103,8 +104,9 @@ class PictureStrategy : public RecordingStrategy { fHeight = imageInfo.height(); } - const SkBitmap& recordAndReplay(const Drawer& drawer, const SkRect& intoClip, - SkBlendMode mode) override { + virtual const SkBitmap& recordAndReplay(const Drawer& drawer, + const SkRect& intoClip, + SkXfermode::Mode mode) { SkRTreeFactory factory; SkPictureRecorder recorder; SkRect canvasRect(SkRect::MakeWH(SkIntToScalar(fWidth),SkIntToScalar(fHeight))); @@ -142,9 +144,9 @@ DEF_TEST(SkRecordingAccuracyXfermode, reporter) { SkString errors; #endif - for (int iMode = 0; iMode < int(SkBlendMode::kLastMode); iMode++) { + for (int iMode = 0; iMode < int(SkXfermode::kLastMode); iMode++) { const SkRect& clip = SkRect::MakeXYWH(100, 0, 100, 100); - SkBlendMode mode = SkBlendMode(iMode); + SkXfermode::Mode mode = SkXfermode::Mode(iMode); const SkBitmap& goldenBM = golden.recordAndReplay(drawer, clip, mode); const SkBitmap& pictureBM = picture.recordAndReplay(drawer, clip, mode); |