Revert "Revert "begin to remove SkLONGLONG and wean Skia off of Sk64""

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
@@ skipping 68 matching lines @@
 
 // DEPRECATED
 #define SkFixedFloor(x)     SkFixedFloorToInt(x)
 #define SkFixedCeil(x)      SkFixedCeilToInt(x)
 #define SkFixedRound(x)     SkFixedRoundToInt(x)
 
 #define SkFixedAbs(x)       SkAbs32(x)
 #define SkFixedAve(a, b)    (((a) + (b)) >> 1)
 
 SkFixed SkFixedMul_portable(SkFixed, SkFixed);
-inline SkFixed SkFixedSquare_portable(SkFixed value)
-{
-    uint32_t a = SkAbs32(value);
-    uint32_t ah = a >> 16;
-    uint32_t al = a & 0xFFFF;
-    SkFixed result = ah * a + al * ah + (al * al >> 16);
-    if (result >= 0)
-        return result;
-    else // Overflow.
-        return SK_FixedMax;
-}
 
 #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;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 // 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)((SkLONGLONG)a * b >> 16);
-    }
-    inline SkFixed SkFixedSquare_longlong(SkFixed value)
-    {
-        return (SkFixed)((SkLONGLONG)value * value >> 16);
+        return (SkFixed)((int64_t)a * b >> 16);
     }
     #define SkFixedMul(a,b)     SkFixedMul_longlong(a,b)
-    #define SkFixedSquare(a)    SkFixedSquare_longlong(a)
 #endif
 
 #if defined(SK_CPU_ARM)
     /* This guy does not handle NaN or other obscurities, but is faster than
        than (int)(x*65536)
     */
     inline SkFixed SkFloatToFixed_arm(float x)
     {
         int32_t y, z;
         asm("movs    %1, %3, lsl #1         \n"
@@ skipping 39 matching lines @@
 
 #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