Revert of Revert of stop calling SkScalarDiv

src/animator/SkAnimatorScript2.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkAnimatorScript2.h"
 #include "SkAnimateBase.h"
 #include "SkAnimateMaker.h"
@@ skipping 394 matching lines @@
         case SkType_ARGB:
             type = SkType_Int;
         case SkType_Boolean:
         case SkType_Int:
         case SkType_MSec:
         case SkType_Float:
             SkASSERT(info->getCount() == 1);
             if (info->fType != SkType_MemberProperty && info->fType != SkType_MemberFunction)
                 value->fS32 = *(int32_t*) info->memberData(displayable);    // OK for SkScalar too
             if (type == SkType_MSec) {
-                value->fScalar = SkScalarDiv((SkScalar) value->fS32, 1000); // dividing two ints is the same as dividing two scalars
+                value->fScalar = value->fS32 * 0.001f;
                 type = SkType_Float;
             }
             break;
         case SkType_String: {
             SkString* displayableString;
             if (info->fType != SkType_MemberProperty && info->fType != SkType_MemberFunction) {
                 info->getString(displayable, &displayableString);
                 value->fString = new SkString(*displayableString);
             }
             } break;
@@ skipping 187 matching lines @@
                 SkASSERT(value.fOperand.fString->equals(scriptTests[index].fStringAnswer));
                 break;
             default:
                 SkASSERT(0);
         }
     }
 #endif
 }
 
 #endif