From 1243b702eed1fa6f37da7d3ce71f41b4bc45ea7c Mon Sep 17 00:00:00 2001 From: robertphillips Date: Thu, 7 Jan 2016 14:17:20 -0800 Subject: Revert of Fix handling of radii scaling to force the result to always be less (patchset #14 id:250001 of https://codereview.chromium.org/1567723004/ ) Reason for revert: Fear and doubt of NexusPlayer Original issue's description: > Fix handling of radii scaling to force the result to always be less > than a given side. > BUG=472147 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1567723004 > > Committed: https://skia.googlesource.com/skia/+/f96bf1a2d091a917bb93f9e9a3a8d53bb39d068e TBR=reed@google.com,herb@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=472147 Review URL: https://codereview.chromium.org/1568063002 --- tests/DrawPathTest.cpp | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'tests/DrawPathTest.cpp') diff --git a/tests/DrawPathTest.cpp b/tests/DrawPathTest.cpp index e9aa4499d9..364a297123 100644 --- a/tests/DrawPathTest.cpp +++ b/tests/DrawPathTest.cpp @@ -313,39 +313,6 @@ static void test_crbug_165432(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, filteredPath.isEmpty()); } -// http://crbug.com/472147 -// This is a simplified version from the bug. RRect radii not properly scaled. -static void test_crbug_472147_simple(skiatest::Reporter* reporter) { - SkAutoTUnref surface(SkSurface::NewRasterN32Premul(1000, 1000)); - SkCanvas* canvas = surface->getCanvas(); - SkPaint p; - SkRect r = SkRect::MakeLTRB(-246.0f, 33.0f, 848.0f, 33554464.0f); - SkVector radii[4] = { - { 13.0f, 8.0f }, { 170.0f, 2.0 }, { 256.0f, 33554430.0f }, { 120.0f, 5.0f } - }; - SkRRect rr; - rr.setRectRadii(r, radii); - canvas->drawRRect(rr, p); -} - -// http://crbug.com/472147 -// RRect radii not properly scaled. -static void test_crbug_472147_actual(skiatest::Reporter* reporter) { - SkAutoTUnref surface(SkSurface::NewRasterN32Premul(1000, 1000)); - SkCanvas* canvas = surface->getCanvas(); - SkPaint p; - SkRect r = SkRect::MakeLTRB(-246.0f, 33.0f, 848.0f, 33554464.0f); - SkVector radii[4] = { - { 13.0f, 8.0f }, { 170.0f, 2.0 }, { 256.0f, 33554430.0f }, { 120.0f, 5.0f } - }; - SkRRect rr; - rr.setRectRadii(r, radii); - canvas->clipRRect(rr, SkRegion::kIntersect_Op, false); - - SkRect r2 = SkRect::MakeLTRB(0, 33, 1102, 33554464); - canvas->drawRect(r2, p); -} - DEF_TEST(DrawPath, reporter) { test_giantaa(); test_bug533(); @@ -358,8 +325,6 @@ DEF_TEST(DrawPath, reporter) { if (false) test_crbug131181(); test_infinite_dash(reporter); test_crbug_165432(reporter); - test_crbug_472147_simple(reporter); - test_crbug_472147_actual(reporter); test_big_aa_rect(reporter); test_halfway(); } -- cgit v1.2.3