always use 64 bit long for fixed mul

include/core/SkFixed.h

 /*
  * 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.
  */
 
 #ifndef SkFixed_DEFINED
 #define SkFixed_DEFINED
 
@@ skipping 60 matching lines @@
 #define SkFixedCeilToInt(x)     (((x) + SK_Fixed1 - 1) >> 16)
 #define SkFixedFloorToInt(x)    ((x) >> 16)
 
 #define SkFixedRoundToFixed(x)  (((x) + SK_FixedHalf) & 0xFFFF0000)
 #define SkFixedCeilToFixed(x)   (((x) + SK_Fixed1 - 1) & 0xFFFF0000)
 #define SkFixedFloorToFixed(x)  ((x) & 0xFFFF0000)
 
 #define SkFixedAbs(x)       SkAbs32(x)
 #define SkFixedAve(a, b)    (((a) + (b)) >> 1)
 
-SkFixed SkFixedMul_portable(SkFixed, SkFixed);
-
 #define SkFixedDiv(numer, denom)    SkDivBits(numer, denom, 16)
 
 ///////////////////////////////////////////////////////////////////////////////
 // TODO: move fixed sin/cos into SkCosineMapper, as that is the only caller
 //       or rewrite SkCosineMapper to not use it at all
 
 SkFixed SkFixedSinCos(SkFixed radians, SkFixed* cosValueOrNull);
 #define SkFixedSin(radians)         SkFixedSinCos(radians, NULL)
 static inline SkFixed SkFixedCos(SkFixed radians) {
     SkFixed cosValue;
     (void)SkFixedSinCos(radians, &cosValue);
     return cosValue;
 }
 
+inline SkFixed SkFixedMul_longlong(SkFixed a, SkFixed b)
+{
+    return (SkFixed)((int64_t)a * b >> 16);
+}
+
+#define SkFixedMul(a,b)     SkFixedMul_longlong(a,b)
+
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 // Now look for ASM overrides for our portable versions (should consider putting this in its own file)
 
-#ifdef SkLONGLONG
-    inline SkFixed SkFixedMul_longlong(SkFixed a, SkFixed b)
-    {
-        return (SkFixed)((int64_t)a * b >> 16);
-    }
-    #define SkFixedMul(a,b)     SkFixedMul_longlong(a,b)
-#endif
-
 #if defined(SK_CPU_ARM32)
     /* This guy does not handle NaN or other obscurities, but is faster than
        than (int)(x*65536).  When built on Android with -Os, needs forcing
        to inline or we lose the speed benefit.
     */
     SK_ALWAYS_INLINE SkFixed SkFloatToFixed_arm(float x)
     {
         int32_t y, z;
         asm("movs    %1, %3, lsl #1         \n"
             "mov     %2, #0x8E              \n"
@@ skipping 21 matching lines @@
             );
         return x;
     }
     #undef SkFixedMul
     #define SkFixedMul(x, y)        SkFixedMul_arm(x, y)
 
     #undef SkFloatToFixed
     #define SkFloatToFixed(x)  SkFloatToFixed_arm(x)
 #endif
 
-#ifndef SkFixedMul
-    #define SkFixedMul(x, y)    SkFixedMul_portable(x, y)
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 
 typedef int64_t SkFixed48;
 
 #define SkIntToFixed48(x)       ((SkFixed48)(x) << 48)
 #define SkFixed48ToInt(x)       ((int)((x) >> 48))
 #define SkFixedToFixed48(x)     ((SkFixed48)(x) << 32)
 #define SkFixed48ToFixed(x)     ((SkFixed)((x) >> 32))
 #define SkFloatToFixed48(x)     ((SkFixed48)((x) * (65536.0f * 65536.0f * 65536.0f)))
 
 #define SkScalarToFixed48(x)    SkFloatToFixed48(x)
 
 #endif