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/PaintTest.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/PaintTest.cpp')
-rw-r--r-- | tests/PaintTest.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index 9cd9cfc63c..f507467771 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -292,7 +292,7 @@ DEF_TEST(Paint_MoreFlattening, r) { paint.setColor(0x00AABBCC); paint.setTextScaleX(1.0f); // Default value, ignored. paint.setTextSize(19); - paint.setBlendMode(SkBlendMode::kModulate); + paint.setXfermode(SkXfermode::Make(SkXfermode::kModulate_Mode)); paint.setLooper(nullptr); // Default value, ignored. SkBinaryWriteBuffer writer; @@ -311,7 +311,12 @@ DEF_TEST(Paint_MoreFlattening, r) { ASSERT(other.getTextScaleX() == paint.getTextScaleX()); ASSERT(other.getTextSize() == paint.getTextSize()); ASSERT(other.getLooper() == paint.getLooper()); - ASSERT(other.getBlendMode() == paint.getBlendMode()); + + // We have to be a little looser and compare just the modes. Pointers might not be the same. + SkXfermode::Mode otherMode, paintMode; + ASSERT(other.getXfermode()->asMode(&otherMode)); + ASSERT(paint.getXfermode()->asMode(&paintMode)); + ASSERT(otherMode == paintMode); } DEF_TEST(Paint_getHash, r) { @@ -350,11 +355,11 @@ DEF_TEST(Paint_nothingToDraw, r) { REPORTER_ASSERT(r, paint.nothingToDraw()); paint.setAlpha(0xFF); - paint.setBlendMode(SkBlendMode::kDst); + paint.setXfermodeMode(SkXfermode::kDst_Mode); REPORTER_ASSERT(r, paint.nothingToDraw()); paint.setAlpha(0); - paint.setBlendMode(SkBlendMode::kSrcOver); + paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); SkColorMatrix cm; cm.setIdentity(); // does not change alpha |