Revert of remove Sk64 from public API, and start to remove usage internally

include/utils/SkRandom.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 SkRandom_DEFINED
 #define SkRandom_DEFINED
 
+#include "Sk64.h"
 #include "SkScalar.h"
 
-#ifdef SK_SUPPORT_LEGACY_SK64
-    #include "Sk64.h"
-#endif
-
 /** \class SkLCGRandom
 
     Utility class that implements pseudo random 32bit numbers using a fast
     linear equation. Unlike rand(), this class holds its own seed (initially
     set to 0), so that multiple instances can be used with no side-effects.
 */
 class SkLCGRandom {
 public:
     SkLCGRandom() : fSeed(0) {}
     SkLCGRandom(uint32_t seed) : fSeed(seed) {}
@@ skipping 90 matching lines @@
     */
     bool nextBool() { return this->nextU() >= 0x80000000; }
 
     /** A biased version of nextBool().
      */
     bool nextBiasedBool(SkScalar fractionTrue) {
         SkASSERT(fractionTrue >= 0 && fractionTrue <= SK_Scalar1);
         return this->nextUScalar1() <= fractionTrue;
     }
 
-    /**
-     *  Return the next pseudo random number as a signed 64bit value.
-     */
-    int64_t next64() {
-        int64_t hi = this->nextS();
-        return (hi << 32) | this->nextU();
-    }
-
-#ifdef SK_SUPPORT_LEGACY_SK64
-    SK_ATTR_DEPRECATED("use next64()")
+    /** Return the next pseudo random number as a signed 64bit value.
+    */
     void next64(Sk64* a) {
         SkASSERT(a);
         a->set(this->nextS(), this->nextU());
     }
-#endif
+
     /**
      *  Return the current seed. This allows the caller to later reset to the
      *  same seed (using setSeed) so it can generate the same sequence.
      */
     int32_t getSeed() const { return fSeed; }
 
     /** Set the seed of the random object. The seed is initialized to 0 when the
         object is first created, and is updated each time the next pseudo random
         number is requested.
     */
@@ skipping 126 matching lines @@
      */
     bool nextBool() { return this->nextU() >= 0x80000000; }
 
     /** A biased version of nextBool().
      */
     bool nextBiasedBool(SkScalar fractionTrue) {
         SkASSERT(fractionTrue >= 0 && fractionTrue <= SK_Scalar1);
         return this->nextUScalar1() <= fractionTrue;
     }
 
-    /**
-     *  Return the next pseudo random number as a signed 64bit value.
+    /** Return the next pseudo random number as a signed 64bit value.
      */
-    int64_t next64() {
-        int64_t hi = this->nextS();
-        return (hi << 32) | this->nextU();
-    }
-    
-#ifdef SK_SUPPORT_LEGACY_SK64
-    SK_ATTR_DEPRECATED("use next64()")
     void next64(Sk64* a) {
         SkASSERT(a);
         a->set(this->nextS(), this->nextU());
     }
-#endif
 
     /** Reset the random object.
      */
     void setSeed(uint32_t seed) { init(seed); }
 
 private:
     // Initialize state variables with LCG.
     // We must ensure that both J and K are non-zero, otherwise the
     // multiply-with-carry step will forevermore return zero.
     void init(uint32_t seed) {
@@ skipping 19 matching lines @@
     enum {
         kKMul = 30345,
         kJMul = 18000,
     };
 
     uint32_t fK;
     uint32_t fJ;
 };
 
 #endif