diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-09 13:50:09 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-09 13:50:09 +0000 |
| commit | cb6d97ca718c0335dde678bb64169f6de70b62d6 (patch) | |
| tree | a2363628642b4c6f9d965b4bf4b6831dea12a39c /tests/GradientTest.cpp | |
| parent | 592dee99440059f6c79665e704165c355c99890d (diff) | |
Revert of r9902 (Consider conical shader opaque if it covers
entire plane - https://chromiumcodereview.appspot.com/18533006) due to roll issues (https://codereview.chromium.org/18859007/)
git-svn-id: http://skia.googlecode.com/svn/trunk@9926 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/GradientTest.cpp')
| -rw-r--r-- | tests/GradientTest.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp index b67cc05380..cf8fbee206 100644 --- a/tests/GradientTest.cpp +++ b/tests/GradientTest.cpp @@ -126,34 +126,6 @@ static void conical_gradproc(skiatest::Reporter* reporter, const GradRec& rec) { rec.gradCheck(reporter, s, &info, SkShader::kConical_GradientType); REPORTER_ASSERT(reporter, !memcmp(info.fPoint, rec.fPoint, 2 * sizeof(SkPoint))); REPORTER_ASSERT(reporter, !memcmp(info.fRadius, rec.fRadius, 2 * sizeof(SkScalar))); - REPORTER_ASSERT(reporter, !s->isOpaque()); -} - -// 2-point radial gradient should behave as opaque when it extends to the entire plane -static void conical_gradproc_opaque(skiatest::Reporter* reporter, const GradRec& rec) { - SkAutoTUnref<SkShader> s(SkGradientShader::CreateTwoPointConical(rec.fPoint[0], - rec.fRadius[0], - rec.fPoint[0], - rec.fRadius[1], - rec.fColors, - rec.fPos, - rec.fColorCount, - rec.fTileMode)); - REPORTER_ASSERT(reporter, s->isOpaque()); -} - -// 2nd circle center lies on edge of first circle should not be considered opaque -static void conical_gradproc_not_opaque(skiatest::Reporter* reporter, const GradRec& rec) { - SkScalar dist = SkPoint::Distance(rec.fPoint[0], rec.fPoint[1]); - SkAutoTUnref<SkShader> s(SkGradientShader::CreateTwoPointConical(rec.fPoint[0], - dist, - rec.fPoint[1], - rec.fRadius[1], - rec.fColors, - rec.fPos, - rec.fColorCount, - rec.fTileMode)); - REPORTER_ASSERT(reporter, !s->isOpaque()); } // Ensure that repeated color gradients behave like drawing a single color @@ -213,8 +185,6 @@ static void TestGradientShaders(skiatest::Reporter* reporter) { radial2_gradproc, sweep_gradproc, conical_gradproc, - conical_gradproc_opaque, - conical_gradproc_not_opaque, }; for (size_t i = 0; i < SK_ARRAY_COUNT(gProcs); ++i) { |