Removed unused parameters

src/animator/SkAnimator.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 "SkAnimator.h"
@@ skipping 205 matching lines @@
 SkFieldType SkAnimator::getFieldType(const SkMemberInfo* ai) {
     const SkMemberInfo* info = (const SkMemberInfo*) ai;
     return (SkFieldType) info->getType();
 }
 
 SkFieldType SkAnimator::getFieldType(const char* id, const char* fieldID) {
     const SkMemberInfo* field = getField(id, fieldID);
     return getFieldType(field);
 }
 
- static bool getArrayCommon(const SkDisplayable* ae, const SkMemberInfo* ai,
-     int index, SkOperand* operand, SkDisplayTypes type) {
+static bool getArrayCommon(const SkDisplayable* ae, const SkMemberInfo* ai,
+                           int index, SkOperand* operand) {
     const SkDisplayable* element = (const SkDisplayable*) ae;
     const SkMemberInfo* info = (const SkMemberInfo*) ai;
     SkASSERT(info->fType == SkType_Array);
     return info->getArrayValue(element, index, operand);
 }
 
 int32_t SkAnimator::getArrayInt(const SkDisplayable* ae,
         const SkMemberInfo* ai, int index) {
     SkOperand operand;
-    bool result = getArrayCommon(ae, ai, index, &operand, SkType_Int);
+    bool result = getArrayCommon(ae, ai, index, &operand);
     return result ? operand.fS32 : SK_NaN32;
 }
 
 int32_t SkAnimator::getArrayInt(const char* id, const char* fieldID, int index) {
     const SkDisplayable* element = getElement(id);
     if (element == NULL)
         return SK_NaN32;
     const SkMemberInfo* field = getField(element, fieldID);
     if (field == NULL)
         return SK_NaN32;
     return getArrayInt(element, field, index);
 }
 
 SkScalar SkAnimator::getArrayScalar(const SkDisplayable* ae,
         const SkMemberInfo* ai, int index) {
     SkOperand operand;
-    bool result = getArrayCommon(ae, ai, index, &operand, SkType_Float);
+    bool result = getArrayCommon(ae, ai, index, &operand);
     return result ? operand.fScalar : SK_ScalarNaN;
 }
 
 SkScalar SkAnimator::getArrayScalar(const char* id, const char* fieldID, int index) {
     const SkDisplayable* element = getElement(id);
     if (element == NULL)
         return SK_ScalarNaN;
     const SkMemberInfo* field = getField(element, fieldID);
     if (field == NULL)
         return SK_ScalarNaN;
     return getArrayScalar(element, field, index);
 }
 
 const char* SkAnimator::getArrayString(const SkDisplayable* ae,
         const SkMemberInfo* ai, int index) {
     SkOperand operand;
-    bool result = getArrayCommon(ae, ai, index, &operand, SkType_String);
+    bool result = getArrayCommon(ae, ai, index, &operand);
     return result ? operand.fString->c_str() : NULL;
 }
 
 const char* SkAnimator::getArrayString(const char* id, const char* fieldID, int index) {
     const SkDisplayable* element = getElement(id);
     if (element == NULL)
         return NULL;
     const SkMemberInfo* field = getField(element, fieldID);
     if (field == NULL)
         return NULL;
@@ skipping 385 matching lines @@
 #ifdef SK_SUPPORT_UNITTEST
 #include "SkAnimatorScript.h"
 #include "SkBase64.h"
 #include "SkParse.h"
 #include "SkMemberInfo.h"
 
 #define unittestline(type)  { #type , type::UnitTest }
 #endif
 
 
+#ifdef SK_SUPPORT_UNITTEST
 void SkAnimator::Init(bool runUnitTests) {
-#ifdef SK_SUPPORT_UNITTEST
     if (runUnitTests == false)
         return;
     static const struct {
         const char* fTypeName;
         void (*fUnitTest)( );
     } gUnitTests[] = {
         unittestline(SkBase64),
         unittestline(SkDisplayType),
         unittestline(SkParse),
         unittestline(SkScriptEngine),
 //      unittestline(SkScriptEngine2),  // compiled script experiment
         unittestline(SkAnimatorScript)
     };
     for (int i = 0; i < (int)SK_ARRAY_COUNT(gUnitTests); i++)
     {
         SkDebugf("SkAnimator: Running UnitTest for %s\n", gUnitTests[i].fTypeName);
         gUnitTests[i].fUnitTest();
         SkDebugf("SkAnimator: End UnitTest for %s\n", gUnitTests[i].fTypeName);
     }
+}
+#else
+void SkAnimator::Init(bool) {}
 #endif
-}
 
 void SkAnimator::Term() {
 }