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/RecordOptsTest.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/RecordOptsTest.cpp')
| -rw-r--r-- | tests/RecordOptsTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/RecordOptsTest.cpp b/tests/RecordOptsTest.cpp index 4567a01409..b7c9ae96c6 100644 --- a/tests/RecordOptsTest.cpp +++ b/tests/RecordOptsTest.cpp @@ -140,7 +140,7 @@ DEF_TEST(RecordOpts_NoopSaveLayerDrawRestore, r) { SkPaint alphaOnlyLayerPaint, translucentLayerPaint, xfermodeLayerPaint; alphaOnlyLayerPaint.setColor(0x03000000); // Only alpha. translucentLayerPaint.setColor(0x03040506); // Not only alpha. - xfermodeLayerPaint.setXfermodeMode(SkXfermode::kDstIn_Mode); // Any effect will do. + xfermodeLayerPaint.setBlendMode(SkBlendMode::kDstIn); // Any effect will do. SkPaint opaqueDrawPaint, translucentDrawPaint; opaqueDrawPaint.setColor(0xFF020202); // Opaque. @@ -222,10 +222,10 @@ DEF_TEST(RecordOpts_MergeSvgOpacityAndFilterLayers, r) { SkPaint translucentLayerPaint; translucentLayerPaint.setColor(0x03040506); // Not only alpha. SkPaint xfermodePaint; - xfermodePaint.setXfermodeMode(SkXfermode::kDstIn_Mode); + xfermodePaint.setBlendMode(SkBlendMode::kDstIn); SkPaint colorFilterPaint; colorFilterPaint.setColorFilter( - SkColorFilter::MakeModeFilter(SK_ColorLTGRAY, SkXfermode::kSrcIn_Mode)); + SkColorFilter::MakeModeFilter(SK_ColorLTGRAY, SkBlendMode::kSrcIn)); SkPaint opaqueFilterLayerPaint; opaqueFilterLayerPaint.setColor(0xFF020202); // Opaque. @@ -353,7 +353,7 @@ static void do_draw(SkCanvas* canvas, SkColor color, bool doLayer) { if (doLayer) { canvas->saveLayer(nullptr, nullptr); - p.setXfermodeMode(SkXfermode::kSrc_Mode); + p.setBlendMode(SkBlendMode::kSrc); canvas->drawPaint(p); canvas->restore(); } else { |