diff options
| author |  Mike Reed <reed@google.com> | 2016-10-05 14:03:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-05 18:31:17 +0000 |
| commit | 2b2fc7db4f8a4a4d4a51d7eb4df6aa62e309928d (patch) | |
| tree | cfa3f2de434cb5dcabf98720460105964f78bfc3 /tests/SerializationTest.cpp | |
| parent | dbb84c268bd09d2aa47256b5315a87f891583b6b (diff) | |
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>
Diffstat (limited to 'tests/SerializationTest.cpp')
| -rw-r--r-- | tests/SerializationTest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp index 9e407015b9..26a2da46d8 100644 --- a/tests/SerializationTest.cpp +++ b/tests/SerializationTest.cpp @@ -260,7 +260,7 @@ static void TestBitmapSerialization(const SkBitmap& validBitmap, sk_sp<SkImage> invalidImage(SkImage::MakeFromBitmap(invalidBitmap)); sk_sp<SkImageFilter> invalidBitmapSource(SkImageSource::Make(std::move(invalidImage))); sk_sp<SkImageFilter> xfermodeImageFilter( - SkXfermodeImageFilter::Make(SkXfermode::Make(SkXfermode::kSrcOver_Mode), + SkXfermodeImageFilter::Make(SkBlendMode::kSrcOver, std::move(invalidBitmapSource), std::move(validBitmapSource), nullptr)); |