| Index: tests/AAClipTest.cpp
|
| diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp
|
| index 1ee6358a6eb1944712a96c10822950469a88490b..faf45ed70be781dbc17d5d34a7db2b8718478ed9 100644
|
| --- a/tests/AAClipTest.cpp
|
| +++ b/tests/AAClipTest.cpp
|
| @@ -370,7 +370,7 @@ static bool operator==(const SkRasterClip& a, const SkRasterClip& b) {
|
|
|
| static void did_dx_affect(skiatest::Reporter* reporter, const SkScalar dx[],
|
| size_t count, bool changed) {
|
| - const SkISize baseSize = SkISize::Make(10, 10);
|
| + const SkIRect baseBounds = SkIRect::MakeXYWH(0, 0, 10, 10);
|
| SkIRect ir = { 0, 0, 10, 10 };
|
|
|
| for (size_t i = 0; i < count; ++i) {
|
| @@ -381,11 +381,11 @@ static void did_dx_affect(skiatest::Reporter* reporter, const SkScalar dx[],
|
| SkRasterClip rc1(ir);
|
| SkRasterClip rc2(ir);
|
|
|
| - rc0.op(r, baseSize, SkRegion::kIntersect_Op, false);
|
| + rc0.op(r, baseBounds, SkRegion::kIntersect_Op, false);
|
| r.offset(dx[i], 0);
|
| - rc1.op(r, baseSize, SkRegion::kIntersect_Op, true);
|
| + rc1.op(r, baseBounds, SkRegion::kIntersect_Op, true);
|
| r.offset(-2*dx[i], 0);
|
| - rc2.op(r, baseSize, SkRegion::kIntersect_Op, true);
|
| + rc2.op(r, baseBounds, SkRegion::kIntersect_Op, true);
|
|
|
| REPORTER_ASSERT(reporter, changed != (rc0 == rc1));
|
| REPORTER_ASSERT(reporter, changed != (rc0 == rc2));
|
| @@ -431,7 +431,7 @@ static void test_crbug_422693(skiatest::Reporter* reporter) {
|
| SkRasterClip rc(SkIRect::MakeLTRB(-25000, -25000, 25000, 25000));
|
| SkPath path;
|
| path.addCircle(50, 50, 50);
|
| - rc.op(path, rc.getBounds().size(), SkRegion::kIntersect_Op, true);
|
| + rc.op(path, rc.getBounds(), SkRegion::kIntersect_Op, true);
|
| }
|
|
|
| DEF_TEST(AAClip, reporter) {
|
|
|