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

src/core/SkMath.cpp

 /*
  * Copyright 2008 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 "SkMathPriv.h"
 #include "SkFloatBits.h"
 #include "SkFloatingPoint.h"
@@ skipping 37 matching lines @@
     SkASSERT(denom);
 
     Sk64 tmp;
     tmp.setMul(numer1, numer2);
     tmp.div(denom, Sk64::kTrunc_DivOption);
     return tmp.get32();
 }
 
 SkFixed SkFixedMul_portable(SkFixed a, SkFixed b) {
 #if defined(SkLONGLONG)
-    return static_cast<SkFixed>((SkLONGLONG)a * b >> 16);
+    return static_cast<SkFixed>((int64_t)a * b >> 16);
 #else
     int sa = SkExtractSign(a);
     int sb = SkExtractSign(b);
     // now make them positive
     a = SkApplySign(a, sa);
     b = SkApplySign(b, sb);
 
     uint32_t    ah = a >> 16;
     uint32_t    al = a & 0xFFFF;
     uint32_t bh = b >> 16;
@@ skipping 221 matching lines @@
         int diff = cos2 + sin2 - SK_Fixed1;
         SkASSERT(SkAbs32(diff) <= 7);
     }
 #endif
 
     if (cosValuePtr) {
         *cosValuePtr = cosValue;
     }
     return sinValue;
 }