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

include/core/Sk64.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 Sk64_DEFINED
 #define Sk64_DEFINED
 
 #include "SkTypes.h"
 
 /** \class Sk64
 
     Sk64 is a 64-bit math package that does not require long long support from the compiler.
 */
 struct SK_API Sk64 {
+private:
     int32_t  fHi;   //!< the high 32 bits of the number (including sign)
     uint32_t fLo;   //!< the low 32 bits of the number
 
+public:
+    int32_t hi() const { return fHi; }
+    uint32_t lo() const { return fLo; }
+
+    int64_t as64() const { return ((int64_t)fHi << 32) | fLo; }
+    int64_t getLongLong() const { return this->as64(); }
+
     /** Returns non-zero if the Sk64 can be represented as a signed 32 bit integer
     */
     SkBool is32() const { return fHi == ((int32_t)fLo >> 31); }
 
     /** Returns non-zero if the Sk64 cannot be represented as a signed 32 bit integer
     */
     SkBool is64() const { return fHi != ((int32_t)fLo >> 31); }
 
     /** Return the signed 32 bit integer equivalent. Asserts that is32() returns non-zero.
     */
@@ skipping 129 matching lines @@
     }
 
     friend bool operator>(const Sk64& a, const Sk64& b) {
         return a.fHi > b.fHi || (a.fHi == b.fHi && a.fLo > b.fLo);
     }
 
     friend bool operator>=(const Sk64& a, const Sk64& b) {
         return a.fHi > b.fHi || (a.fHi == b.fHi && a.fLo >= b.fLo);
     }
 
-#ifdef SkLONGLONG
-    SkLONGLONG getLongLong() const;
-#endif
+    // Private to unittests. Parameter is (skiatest::Reporter*)
+    static void UnitTestWithReporter(void* skiatest_reporter);
 };
 
 #endif