diff options
| author |  reed <reed@google.com> | 2015-05-12 10:28:06 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-12 10:28:06 -0700 |
| commit | 2629697933b5cc975e45d2a45c48f803fc6cbcec (patch) | |
| tree | 53730ca8354552773d93adfe7ade5f1e2bc18192 /tests/MatrixTest.cpp | |
| parent | 39a9a5069b25aa8b9529118cfd0ece5f412fb56b (diff) | |
Revert of stop calling SkScalarDiv (patchset #4 id:60001 of https://codereview.chromium.org/1135053002/)
Reason for revert:
need to wait for Blink roll (and patch android)
Original issue's description:
> stop calling SkScalarDiv
>
> BUG=skia:
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/67d71c898249a7af3523b16c6a69895a63bfae0a
TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1138263002
Diffstat (limited to 'tests/MatrixTest.cpp')
| -rw-r--r-- | tests/MatrixTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp index 72e0dcc021..95d33acabd 100644 --- a/tests/MatrixTest.cpp +++ b/tests/MatrixTest.cpp @@ -270,8 +270,8 @@ static void test_matrix_min_max_scale(skiatest::Reporter* reporter) { mat.mapVectors(vectors, SK_ARRAY_COUNT(vectors)); for (size_t i = 0; i < SK_ARRAY_COUNT(vectors); ++i) { SkScalar d = vectors[i].length(); - REPORTER_ASSERT(reporter, d / maxScale < gVectorScaleTol); - REPORTER_ASSERT(reporter, minScale / d < gVectorScaleTol); + REPORTER_ASSERT(reporter, SkScalarDiv(d, maxScale) < gVectorScaleTol); + REPORTER_ASSERT(reporter, SkScalarDiv(minScale, d) < gVectorScaleTol); if (max < d) { max = d; } @@ -279,8 +279,8 @@ static void test_matrix_min_max_scale(skiatest::Reporter* reporter) { min = d; } } - REPORTER_ASSERT(reporter, max / maxScale >= gCloseScaleTol); - REPORTER_ASSERT(reporter, minScale / min >= gCloseScaleTol); + REPORTER_ASSERT(reporter, SkScalarDiv(max, maxScale) >= gCloseScaleTol); + REPORTER_ASSERT(reporter, SkScalarDiv(minScale, min) >= gCloseScaleTol); } } |