From 2cf444f7040614b43af67e368f3aa636ebeaa45a Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Fri, 26 Apr 2013 07:00:58 +0000 Subject: Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk@8873 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/RoundRectTest.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/RoundRectTest.cpp') diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp index 486037c79a..93f5e7d20f 100644 --- a/tests/RoundRectTest.cpp +++ b/tests/RoundRectTest.cpp @@ -320,12 +320,12 @@ static void test_round_rect_iffy_parameters(skiatest::Reporter* reporter) { // Move a small box from the start position by (stepX, stepY) 'numSteps' times // testing for containment in 'rr' at each step. static void test_direction(skiatest::Reporter* reporter, const SkRRect &rr, - SkScalar initX, int stepX, SkScalar initY, int stepY, + SkScalar initX, int stepX, SkScalar initY, int stepY, int numSteps, const bool* contains) { SkScalar x = initX, y = initY; for (int i = 0; i < numSteps; ++i) { - SkRect test = SkRect::MakeXYWH(x, y, - stepX ? SkIntToScalar(stepX) : SK_Scalar1, + SkRect test = SkRect::MakeXYWH(x, y, + stepX ? SkIntToScalar(stepX) : SK_Scalar1, stepY ? SkIntToScalar(stepY) : SK_Scalar1); test.sort(); @@ -364,15 +364,15 @@ static void test_round_rect_contains_rect(skiatest::Reporter* reporter) { { -5, 35, 5, 45 }, // SW { -5, 15, 5, 20 } // W }; - + for (int i = 0; i < kNumRRects; ++i) { for (size_t j = 0; j < SK_ARRAY_COUNT(easyOuts); ++j) { REPORTER_ASSERT(reporter, !rrects[i].contains(easyOuts[j])); } } - // Now test non-trivial containment. For each compass - // point walk a 1x1 rect in from the edge of the bounding + // Now test non-trivial containment. For each compass + // point walk a 1x1 rect in from the edge of the bounding // rect static const int kNumSteps = 15; bool answers[kNumRRects][8][kNumSteps] = { @@ -389,8 +389,8 @@ static void test_round_rect_contains_rect(skiatest::Reporter* reporter) { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, }, // for the circle we expect 6 blocks to be out on the - // corners (then the rest in) and only the first block - // out on the vertical and horizontal axes (then + // corners (then the rest in) and only the first block + // out on the vertical and horizontal axes (then // the rest in) { // circle -- cgit v1.2.3