deprecate SkScalarRound (and its ilk), use SkScalarRound[ToInt,ToScalar]. #define SK_SUPPORT_DEPREC…

src/animator/SkScriptRuntime.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 "SkScriptRuntime.h"
 #include "SkScript2.h"
 #include "SkMath.h"
@@ skipping 192 matching lines @@
             if (SkParse::FindS32(operand[0].fString->c_str(), &operand[0].fS32) == NULL)
                 return false;
             break;
         case SkScriptEngine2::kStringToScalar:
         case SkScriptEngine2::kStringToScalar2:
             if (SkParse::FindScalar(operand[0].fString->c_str(),
                     &operand[op - SkScriptEngine2::kStringToScalar].fScalar) == NULL)
                 return false;
             break;
         case SkScriptEngine2::kScalarToInt:
-            operand[0].fS32 = SkScalarFloor(operand[0].fScalar);
+            operand[0].fS32 = SkScalarFloorToInt(operand[0].fScalar);
             break;
         // arithmetic ops
         case SkScriptEngine2::kAddInt:
             operand[0].fS32 += operand[1].fS32;
             break;
         case SkScriptEngine2::kAddScalar:
             operand[0].fScalar += operand[1].fScalar;
             break;
         case SkScriptEngine2::kAddString:
 //            if (fTrackString.find(operand[1].fString) < 0) {
@@ skipping 118 matching lines @@
     int index = fTrackArray.find(array);
     SkASSERT(index >= 0);
     fTrackArray.begin()[index] = NULL;
 }
 
 void SkScriptRuntime::untrack(SkString* string) {
     int index = fTrackString.find(string);
     SkASSERT(index >= 0);
     fTrackString.begin()[index] = NULL;
 }