From c71ffd4e76d1abcd28ac74463349970f60a3350f Mon Sep 17 00:00:00 2001 From: mtklein Date: Tue, 11 Nov 2014 12:13:16 -0800 Subject: Revert of modify nothingToDraw to notice filters (patchset #1 id:1 of https://codereview.chromium.org/717753002/) Reason for revert: modecolorfilters, perhaps more changed Original issue's description: > modify nothingToDraw to notice filters > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/d5688c509293a450c058e0cc1f4673be2931bb5c TBR=djsollen@google.com,reed@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/717813002 --- tests/PaintTest.cpp | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'tests/PaintTest.cpp') diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index c307aa94bc..4c45eed761 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -344,30 +344,3 @@ DEF_TEST(Paint_getHash, r) { paint.setHinting(SkPaint::kNormal_Hinting); REPORTER_ASSERT(r, paint.getHash() == defaultHash); } - -#include "SkColorMatrixFilter.h" - -DEF_TEST(Paint_nothingToDraw, r) { - SkPaint paint; - - REPORTER_ASSERT(r, !paint.nothingToDraw()); - paint.setAlpha(0); - REPORTER_ASSERT(r, paint.nothingToDraw()); - - paint.setAlpha(0xFF); - paint.setXfermodeMode(SkXfermode::kDst_Mode); - REPORTER_ASSERT(r, paint.nothingToDraw()); - - paint.setAlpha(0); - paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); - - SkColorMatrix cm; - cm.setIdentity(); // does not change alpha - paint.setColorFilter(SkColorMatrixFilter::Create(cm))->unref(); - REPORTER_ASSERT(r, paint.nothingToDraw()); - - cm.postTranslate(0, 0, 0, 1); // wacks alpha - paint.setColorFilter(SkColorMatrixFilter::Create(cm))->unref(); - REPORTER_ASSERT(r, !paint.nothingToDraw()); -} - -- cgit v1.2.3