| Index: tests/RegionTest.cpp
|
| diff --git a/tests/RegionTest.cpp b/tests/RegionTest.cpp
|
| index 1c06d7ecde66978b21ede4168f58bd8a3212a526..5d3946ebfe6afc57c82cf58c7ae9fe6198c8ff1a 100644
|
| --- a/tests/RegionTest.cpp
|
| +++ b/tests/RegionTest.cpp
|
| @@ -98,7 +98,7 @@ enum {
|
| H = 256
|
| };
|
|
|
| -static SkIRect randRect(SkMWCRandom& rand) {
|
| +static SkIRect randRect(SkRandom& rand) {
|
| int x = rand.nextU() % W;
|
| int y = rand.nextU() % H;
|
| int w = rand.nextU() % W;
|
| @@ -106,7 +106,7 @@ static SkIRect randRect(SkMWCRandom& rand) {
|
| return SkIRect::MakeXYWH(x, y, w >> 1, h >> 1);
|
| }
|
|
|
| -static void randRgn(SkMWCRandom& rand, SkRegion* rgn, int n) {
|
| +static void randRgn(SkRandom& rand, SkRegion* rgn, int n) {
|
| rgn->setEmpty();
|
| for (int i = 0; i < n; ++i) {
|
| rgn->op(randRect(rand), SkRegion::kUnion_Op);
|
| @@ -183,7 +183,7 @@ static void intersects_proc(skiatest::Reporter* reporter,
|
| static void test_proc(skiatest::Reporter* reporter,
|
| void (*proc)(skiatest::Reporter*,
|
| const SkRegion& a, const SkRegion&)) {
|
| - SkMWCRandom rand;
|
| + SkRandom rand;
|
| for (int i = 0; i < 10000; ++i) {
|
| SkRegion outer;
|
| randRgn(rand, &outer, 8);
|
| @@ -193,7 +193,7 @@ static void test_proc(skiatest::Reporter* reporter,
|
| }
|
| }
|
|
|
| -static void rand_rect(SkIRect* rect, SkMWCRandom& rand) {
|
| +static void rand_rect(SkIRect* rect, SkRandom& rand) {
|
| int bits = 6;
|
| int shift = 32 - bits;
|
| rect->set(rand.nextU() >> shift, rand.nextU() >> shift,
|
| @@ -237,7 +237,7 @@ static void TestRegion(skiatest::Reporter* reporter) {
|
| };
|
| REPORTER_ASSERT(reporter, test_rects(rects, SK_ARRAY_COUNT(rects)));
|
|
|
| - SkMWCRandom rand;
|
| + SkRandom rand;
|
| for (int i = 0; i < 1000; i++) {
|
| SkRegion rgn0, rgn1;
|
|
|
|
|