From 3ed485f4249e17abb4b11f5018d03175fd1afb44 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 4 Oct 2016 21:35:32 +0000 Subject: Revert[5] "replace SkXfermode obj with SkBlendMode enum in paints" This reverts commit I0fa5c58af428f3da8565465d1219a34ef8417d9a. Reason for revert: failing to deserialize some of the 100K Original change's description: > Revert[4] "replace SkXfermode obj with SkBlendMode enum in paints" > > This reverts commit 2cbcd12281ee807214df094964c584c78932e10b. > > BUG=skia: > > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2924 > > Change-Id: I0fa5c58af428f3da8565465d1219a34ef8417d9a > Reviewed-on: https://skia-review.googlesource.com/2924 > Reviewed-by: Mike Reed > Commit-Queue: Mike Reed > TBR=reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I1805a57eef5ebcac203da5989c8539345ecf806f Reviewed-on: https://skia-review.googlesource.com/2962 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- tests/SerializationTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/SerializationTest.cpp') diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp index 26a2da46d8..9e407015b9 100644 --- a/tests/SerializationTest.cpp +++ b/tests/SerializationTest.cpp @@ -260,7 +260,7 @@ static void TestBitmapSerialization(const SkBitmap& validBitmap, sk_sp invalidImage(SkImage::MakeFromBitmap(invalidBitmap)); sk_sp invalidBitmapSource(SkImageSource::Make(std::move(invalidImage))); sk_sp xfermodeImageFilter( - SkXfermodeImageFilter::Make(SkBlendMode::kSrcOver, + SkXfermodeImageFilter::Make(SkXfermode::Make(SkXfermode::kSrcOver_Mode), std::move(invalidBitmapSource), std::move(validBitmapSource), nullptr)); -- cgit v1.2.3