remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats

src/xml/SkJSDisplayable.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 <jsapi.h>
@@ skipping 259 matching lines @@
             *vp = BOOLEAN_TO_JSVAL(s32);
             break;
         case SkType_Color:
         case SkType_S32:
             *vp = INT_TO_JSVAL(s32);
             break;
         case SkType_Scalar:
             if (SkScalarFraction(scalar) == 0)
                 *vp = INT_TO_JSVAL(SkScalarFloor(scalar));
             else
-#ifdef SK_SCALAR_IS_FLOAT
             *vp = DOUBLE_TO_JSVAL(scalar);
-#else
-            *vp = DOUBLE_TO_JSVAL(scalar / 65536.0f );
-#endif
             break;
         case SkType_String:
             str = JS_NewStringCopyN(cx, string->c_str(), string->size());
             *vp = STRING_TO_JSVAL(str);
             break;
         default:
             SkASSERT(0); // !!! unimplemented
     }
     return JS_TRUE;
 }
@@ skipping 21 matching lines @@
             break;
         case SkType_Color:
         case SkType_S32:
             s32 = JSVAL_TO_INT(value);
             break;
         case SkType_Scalar:
             if (JSVAL_IS_INT(value))
                 scalar = SkIntToScalar(JSVAL_TO_INT(value));
             else {
                 SkASSERT(JSVAL_IS_DOUBLE(value));
-#ifdef SK_SCALAR_IS_FLOAT
                 scalar = (float) *(double*) JSVAL_TO_DOUBLE(value);
-#else
-                scalar = (SkFixed)  (*(double*)JSVAL_TO_DOUBLE(value) * 65536.0);
-#endif
             }
             break;
         case SkType_String:
             str = JS_ValueToString(cx, value);
             string.set(JS_GetStringBytes(str));
             break;
         default:
             SkASSERT(0); // !!! unimplemented
     }
     if (info->fType == SkType_MemberProperty) {
@@ skipping 110 matching lines @@
 }
 
 void SkJS::DisposeDisplayables() {
     delete SkJSDisplayable::gPaint;
     delete SkJSDisplayable::gCanvas;
     for (int index = 0; index < kTypeNamesSize; index++) {
         SkDisplayTypes type = gTypeNames[index].fType;
         delete[] gDisplayableProperties[type];
     }
 }