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

src/animator/SkAnimateBase.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 "SkAnimateBase.h"
@@ skipping 145 matching lines @@
         fFieldInfo = fTarget->getMember(arrayStr.c_str());
         SkString scriptStr(arrayEnd + 1, lval.size() - arrayNameLen - 2);
         SkAnimatorScript::EvaluateInt(maker, this, scriptStr.c_str(), &fFieldOffset);
     }
 }
 
 void SkAnimateBase::packARGB(SkScalar array[], int count, SkTDOperandArray* converted)
 {
     SkASSERT(count == 4);
     converted->setCount(1);
-    SkColor color = SkColorSetARGB(SkScalarRound(array[0]), SkScalarRound(array[1]),
-        SkScalarRound(array[2]), SkScalarRound(array[3]));
+    SkColor color = SkColorSetARGB(SkScalarRoundToInt(array[0]),
+                                   SkScalarRoundToInt(array[1]),
+                                   SkScalarRoundToInt(array[2]),
+                                   SkScalarRoundToInt(array[3]));
     (*converted)[0].fS32 = color;
 }
 
 
 
 void SkAnimateBase::refresh(SkAnimateMaker& ) {
 }
 
 bool SkAnimateBase::setParent(SkDisplayable* apply) {
     SkASSERT(apply->isApply());
@@ skipping 46 matching lines @@
             return;
         }
         if (fApply && fApply->getMode() != SkApply::kMode_create)
             target.reset();
     }
 }
 
 bool SkAnimateBase::targetNeedsInitialization() const {
     return false;
 }