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

src/animator/SkScript.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkScript.h"
@@ skipping 1139 matching lines @@
                 fOpStack.pop();
             else {
                 SkOpType indexType;
                 fTypeStack.pop(&indexType);
                 if (indexType != kInt && indexType != kScalar) {
                     fError = kExpectedNumberForArrayIndex; // (although, could permit strings eventually)
                     return -1;
                 }
                 SkOperand indexOperand;
                 fOperandStack.pop(&indexOperand);
-                int index = indexType == kScalar ? SkScalarFloor(indexOperand.fScalar) :
+                int index = indexType == kScalar ? SkScalarFloorToInt(indexOperand.fScalar) :
                     indexOperand.fS32;
                 SkOpType arrayType;
                 fTypeStack.pop(&arrayType);
                 if ((unsigned)arrayType != (unsigned)kArray) {
                     fError = kExpectedArray;
                     return -1;
                 }
                 SkOperand arrayOperand;
                 fOperandStack.pop(&arrayOperand);
                 SkTypedArray* array = arrayOperand.fArray;
@@ skipping 146 matching lines @@
         if ((type1 & attributes->fLeftType) == 0 || type1 != type2) {
             if (type1 == kString) {
                 const char* result = SkParse::FindScalar(operand1.fString->c_str(), &operand1.fScalar);
                 if (result == NULL) {
                     fError = kExpectedNumber;
                     return false;
                 }
                 type1 = kScalar;
             }
             if (type1 == kScalar && (attributes->fLeftType == kInt || type2 == kInt)) {
-                operand1.fS32 = SkScalarFloor(operand1.fScalar);
+                operand1.fS32 = SkScalarFloorToInt(operand1.fScalar);
                 type1 = kInt;
             }
         }
     }
     if ((type2 & attributes->fRightType) == 0 || type1 != type2) {
         if (type2 == kString) {
             const char* result = SkParse::FindScalar(operand2.fString->c_str(), &operand2.fScalar);
             if (result == NULL) {
                 fError = kExpectedNumber;
                 return false;
             }
             type2 = kScalar;
         }
         if (type2 == kScalar && (attributes->fRightType == kInt || type1 == kInt)) {
-            operand2.fS32 = SkScalarFloor(operand2.fScalar);
+            operand2.fS32 = SkScalarFloorToInt(operand2.fScalar);
             type2 = kInt;
         }
     }
     if (type2 == kScalar)
         op = (SkOp) (op + 1);
     else if (type2 == kString)
         op = (SkOp) (op + 2);
     switch(op) {
         case kAddInt:
             operand2.fS32 += operand1.fS32;
@@ skipping 143 matching lines @@
     SkDisplayTypes type = value->fType;
     if (type == toType)
         return true;
     SkOperand& operand = value->fOperand;
     bool success = true;
     switch (toType) {
         case SkType_Int:
             if (type == SkType_Boolean)
                 break;
             if (type == SkType_Float)
-                operand.fS32 = SkScalarFloor(operand.fScalar);
+                operand.fS32 = SkScalarFloorToInt(operand.fScalar);
             else {
                 if (type != SkType_String) {
                     success = false;
                     break; // error
                 }
                 success = SkParse::FindS32(operand.fString->c_str(), &operand.fS32) != NULL;
             }
             break;
         case SkType_Float:
             if (type == SkType_Int) {
@@ skipping 364 matching lines @@
                 break;
             case SkType_String:
                 SkASSERT(strcmp(value.fOperand.fString->c_str(), scriptTests[index].fStringAnswer) == 0);
                 break;
             default:
                 SkASSERT(0);
         }
     }
 }
 #endif