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 /src/animator/SkScript.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 'src/animator/SkScript.cpp')
| -rw-r--r-- | src/animator/SkScript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/animator/SkScript.cpp b/src/animator/SkScript.cpp index c430695705..1d04d1b276 100644 --- a/src/animator/SkScript.cpp +++ b/src/animator/SkScript.cpp @@ -1387,7 +1387,7 @@ bool SkScriptEngine::processOp() { if (operand2.fScalar == 0) operand2.fScalar = operand1.fScalar == 0 ? SK_ScalarNaN : operand1.fScalar > 0 ? SK_ScalarMax : -SK_ScalarMax; else - operand2.fScalar = operand1.fScalar / operand2.fScalar; + operand2.fScalar = SkScalarDiv(operand1.fScalar, operand2.fScalar); break; case kEqualInt: operand2.fS32 = operand1.fS32 == operand2.fS32; |