diff options
author | Mike Reed <reed@google.com> | 2016-10-03 18:02:50 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-03 18:03:29 +0000 |
commit | ce02e7175872abde3721df9e5d3ec0ab8384cd8e (patch) | |
tree | 620eec63e1082137df3111d09cd2bf1eb7ebd180 /tests/RecordingXfermodeTest.cpp | |
parent | 6fb592e6afb0061c9c0af15ddf599e2903f508f1 (diff) |
Revert "replace SkXfermode obj with SkBlendMode enum in paints"
This reverts commit I4fb489ba6b3f77b458f7e4a99f79c7ad10859135.
Reason for revert: <INSERT REASONING HERE>
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 <fmalita@chromium.org>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
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 <reed@google.com>
Commit-Queue: 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); |