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 /samplecode/SampleApp.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 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 04b1cb0258..82d42fdfc4 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -1320,18 +1320,18 @@ void SampleWindow::beforeChild(SkView* child, SkCanvas* canvas) { static const SkScalar gAnimPeriod = 10 * SK_Scalar1; static const SkScalar gAnimMag = SK_Scalar1 / 1000; SkScalar t = SkScalarMod(secs, gAnimPeriod); - if (SkScalarFloorToInt(secs / gAnimPeriod) & 0x1) { + if (SkScalarFloorToInt(SkScalarDiv(secs, gAnimPeriod)) & 0x1) { t = gAnimPeriod - t; } t = 2 * t - gAnimPeriod; - t *= gAnimMag / gAnimPeriod; + t = SkScalarMul(SkScalarDiv(t, gAnimPeriod), gAnimMag); SkMatrix m; m.reset(); #if 1 m.setPerspY(t); #else m.setPerspY(SK_Scalar1 / 1000); - m.setSkewX(8.0f / 25); + m.setSkewX(SkScalarDiv(8, 25)); m.dump(); #endif canvas->concat(m); |