diff options
| author |  reed <reed@google.com> | 2015-05-12 10:37:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-12 10:37:34 -0700 |
| commit | 80ea19ca4bdd68c1493666a5fe7e4ce9d43ded8b (patch) | |
| tree | 1ad73d17a3314363d114ddc95932e271ae1e828a /src/animator/SkScriptRuntime.cpp | |
| parent | 1ebf0d2edc48f886521e6f03af78ef5da24c7982 (diff) | |
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
Diffstat (limited to 'src/animator/SkScriptRuntime.cpp')
| -rw-r--r-- | src/animator/SkScriptRuntime.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/animator/SkScriptRuntime.cpp b/src/animator/SkScriptRuntime.cpp index 78d9d5c208..07bd4c9c2f 100644 --- a/src/animator/SkScriptRuntime.cpp +++ b/src/animator/SkScriptRuntime.cpp @@ -249,7 +249,7 @@ bool SkScriptRuntime::executeTokens(unsigned char* opCode) { operand[0].fScalar = operand[0].fScalar == 0 ? SK_ScalarNaN : operand[0].fScalar > 0 ? SK_ScalarMax : -SK_ScalarMax; else - operand[0].fScalar = SkScalarDiv(operand[0].fScalar, operand[1].fScalar); + operand[0].fScalar = operand[0].fScalar / operand[1].fScalar; break; case SkScriptEngine2::kEqualInt: operand[0].fS32 = operand[0].fS32 == operand[1].fS32; |