commit | 80ea19ca4bdd68c1493666a5fe7e4ce9d43ded8b | [log] [tgz] |
---|---|---|
author | reed <reed@google.com> | Tue May 12 10:37:34 2015 -0700 |
committer | Commit bot <commit-bot@chromium.org> | Tue May 12 10:37:34 2015 -0700 |
tree | 1ad73d17a3314363d114ddc95932e271ae1e828a | |
parent | 1ebf0d2edc48f886521e6f03af78ef5da24c7982 [diff] [blame] |
Revert of Revert of stop calling SkScalarDiv (patchset #1 id:1 of https://codereview.chromium.org/1138263002/) Reason for revert: android patched, blink has rolled Original issue's description: > 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: > > Committed: https://skia.googlesource.com/skia/+/2629697933b5cc975e45d2a45c48f803fc6cbcec TBR= NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1135693003
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 82d42fd..04b1cb0 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp
@@ -1320,18 +1320,18 @@ static const SkScalar gAnimPeriod = 10 * SK_Scalar1; static const SkScalar gAnimMag = SK_Scalar1 / 1000; SkScalar t = SkScalarMod(secs, gAnimPeriod); - if (SkScalarFloorToInt(SkScalarDiv(secs, gAnimPeriod)) & 0x1) { + if (SkScalarFloorToInt(secs / gAnimPeriod) & 0x1) { t = gAnimPeriod - t; } t = 2 * t - gAnimPeriod; - t = SkScalarMul(SkScalarDiv(t, gAnimPeriod), gAnimMag); + t *= gAnimMag / gAnimPeriod; SkMatrix m; m.reset(); #if 1 m.setPerspY(t); #else m.setPerspY(SK_Scalar1 / 1000); - m.setSkewX(SkScalarDiv(8, 25)); + m.setSkewX(8.0f / 25); m.dump(); #endif canvas->concat(m);