remove (now unused) Sk64 -- just use int64_t

BUG=

Review URL: https://codereview.chromium.org/134373006

git-svn-id: http://skia.googlecode.com/svn/trunk@13032 2bbb7eff-a529-9590-31e7-b0007b416f81

6 files changed, 2 insertions, 44 deletions

diff --git a/gyp/core.gypi b/gyp/core.gypi
index 4c8b8cd695..aa5292c153 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -7,8 +7,9 @@
 #
 {
     'sources': [
-        '<(skia_src_path)/core/ARGB32_Clamp_Bilinear_BitmapShader.h',
         '<(skia_src_path)/core/Sk64.cpp',
+        '<(skia_src_path)/core/Sk64.h',
+        '<(skia_src_path)/core/ARGB32_Clamp_Bilinear_BitmapShader.h',
         '<(skia_src_path)/core/SkAAClip.cpp',
         '<(skia_src_path)/core/SkAnnotation.cpp',
         '<(skia_src_path)/core/SkAdvancedTypefaceMetrics.cpp',
@@ -213,7 +214,6 @@
         '<(skia_src_path)/pipe/SkGPipeRead.cpp',
         '<(skia_src_path)/pipe/SkGPipeWrite.cpp',
 
-        '<(skia_include_path)/core/Sk64.h',
         '<(skia_include_path)/core/SkAdvancedTypefaceMetrics.h',
         '<(skia_include_path)/core/SkBitmap.h',
         '<(skia_include_path)/core/SkBitmapDevice.h',
diff --git a/gyp/public_headers.gypi b/gyp/public_headers.gypi
index b42623f547..f9e810f8ba 100644
--- a/gyp/public_headers.gypi
+++ b/gyp/public_headers.gypi
@@ -196,7 +196,6 @@
       'core/SkFloatBits.h',
       'core/SkDeque.h',
       'core/SkTRegistry.h',
-      'core/Sk64.h',
       'core/SkTLazy.h',
       'core/SkComposeShader.h',
       'core/SkUtils.h',
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 42d8811f76..b8117bd76f 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -14,10 +14,6 @@
 #include "SkPoint.h"
 #include "SkRefCnt.h"
 
-#ifdef SK_SUPPORT_LEGACY_SK64
-    #include "Sk64.h"
-#endif
-
 struct SkIRect;
 struct SkRect;
 class SkPaint;
@@ -166,22 +162,6 @@ public:
         return ComputeSafeSize64((Config)fConfig, fWidth, fHeight, fRowBytes);
     }
 
-#ifdef SK_SUPPORT_LEGACY_SK64
-    SK_ATTR_DEPRECATED("use getSize64()")
-    Sk64 getSize64() const {
-        Sk64 size;
-        size.set64(this->computeSize64());
-        return size;
-    }
-
-    SK_ATTR_DEPRECATED("use getSafeSize64()")
-    Sk64 getSafeSize64() const {
-        Sk64 size;
-        size.set64(this->computeSafeSize64());
-        return size;
-    }
-#endif
-
     /** Returns true if this bitmap is marked as immutable, meaning that the
         contents of its pixels will not change for the lifetime of the bitmap.
     */
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 06c8583a61..4e2f0c159a 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -13,8 +13,6 @@
 #include "SkPostConfig.h"
 #include <stdint.h>
 
-//#define SK_SUPPORT_LEGACY_SK64
-
 /** \file SkTypes.h
 */
 
diff --git a/include/utils/SkRandom.h b/include/utils/SkRandom.h
index dc9e681c5a..e71be3a9d5 100644
--- a/include/utils/SkRandom.h
+++ b/include/utils/SkRandom.h
@@ -12,10 +12,6 @@
 
 #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
@@ -134,13 +130,6 @@ public:
         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
     /**
      *  Return the current seed. This allows the caller to later reset to the
      *  same seed (using setSeed) so it can generate the same sequence.
@@ -295,14 +284,6 @@ public:
         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); }
diff --git a/include/core/Sk64.h b/src/core/Sk64.h
index c12a97c8a1..c12a97c8a1 100644
--- a/include/core/Sk64.h
+++ b/src/core/Sk64.h