5 files changed, 3 insertions, 68 deletions
diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h
index 66d1c97c77..f41a1bab55 100644
--- a/include/gpu/GrConfig.h
+++ b/include/gpu/GrConfig.h
@@ -139,7 +139,7 @@ typedef unsigned __int64 uint64_t;
  *  GR_USER_CONFIG_FILE. It should be defined relative to GrConfig.h
  *
  *  e.g. it can specify GR_DEBUG/GR_RELEASE as it please, change the BUILD
- *  target, or supply its own defines for anything else (e.g. GR_SCALAR)
+ *  target, or supply its own defines for anything else (e.g. GR_DEFAULT_TEXTURE_CACHE_MB_LIMIT)
  */
 #if !defined(GR_USER_CONFIG_FILE)
     #include "GrUserConfig.h"
@@ -311,13 +311,6 @@ inline void GrCrash(const char* msg) { GrPrintf(msg); GrAlwaysAssert(false); }
     #endif
 #endif
 
-#if !defined(GR_SCALAR_IS_FLOAT)
-    #define GR_SCALAR_IS_FLOAT   0
-#endif
-#if !defined(GR_SCALAR_IS_FIXED)
-    #define GR_SCALAR_IS_FIXED   0
-#endif
-
 #if !defined(GR_TEXT_SCALAR_TYPE_IS_USHORT)
     #define GR_TEXT_SCALAR_TYPE_IS_USHORT  0
 #endif
@@ -397,12 +390,6 @@ inline void GrCrash(const char* msg) { GrPrintf(msg); GrAlwaysAssert(false); }
 #endif
 
 
-#if !GR_SCALAR_IS_FLOAT && !GR_SCALAR_IS_FIXED
-    #undef  GR_SCALAR_IS_FLOAT
-    #define GR_SCALAR_IS_FLOAT              1
-    #pragma message GR_WARN("Scalar type not defined, defaulting to float")
-#endif
-
 #if !GR_TEXT_SCALAR_IS_FLOAT && \
     !GR_TEXT_SCALAR_IS_FIXED && \
     !GR_TEXT_SCALAR_IS_USHORT
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 89cd171a5c..14c550c103 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -388,7 +388,7 @@ public:
      */
     void drawRect(const GrPaint& paint,
                   const GrRect&,
-                  GrScalar strokeWidth = -1,
+                  SkScalar strokeWidth = -1,
                   const GrMatrix* matrix = NULL);
 
     /**
diff --git a/include/gpu/GrPoint.h b/include/gpu/GrPoint.h
index fd2c5a7cc1..302c4e1f27 100644
--- a/include/gpu/GrPoint.h
+++ b/include/gpu/GrPoint.h
@@ -12,7 +12,7 @@
 #define GrPoint_DEFINED
 
 #include "GrTypes.h"
-#include "GrScalar.h"
+#include "SkScalar.h"
 #include "SkPoint.h"
 
 #define GrPoint     SkPoint
diff --git a/include/gpu/GrScalar.h b/include/gpu/GrScalar.h
deleted file mode 100644
index 5d2f13ba19..0000000000
--- a/include/gpu/GrScalar.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-
-#ifndef GrScalar_DEFINED
-#define GrScalar_DEFINED
-
-#include "GrTypes.h"
-#include "SkScalar.h"
-
-#define GR_Int32Min         SK_NaN32
-#define GR_Int32Max         SK_MaxS32
-
-#define GR_Fixed1           SK_Fixed1
-#define GR_FixedHalf        SK_FixedHalf
-#define GrIntToFixed(a)     SkIntToFixed(a)
-#define GrFixedToFloat(a)   SkFixedToFloat(a)
-#define GrFixedFloorToInt(a)    SkFixedFloor(a)
-
-#define GrScalar            SkScalar
-#define GR_Scalar1          SK_Scalar1
-#define GR_ScalarHalf       SK_ScalarHalf
-#define GR_ScalarMin        SK_ScalarMin
-#define GR_ScalarMax        SK_ScalarMax
-
-#define GrIntToScalar(a)    SkIntToScalar(a)
-#define GrScalarHalf(a)     SkScalarHalf(a)
-#define GrScalarAve(a,b)    SkScalarAve(a,b)
-#define GrMul(a,b)          SkScalarMul(a,b) // deprecated, prefer GrScalarMul
-#define GrScalarMul(a,b)    SkScalarMul(a,b)
-#define GrScalarDiv(a,b)    SkScalarDiv(a, b)
-#define GrScalarToFloat(a)  SkScalarToFloat(a)
-#define GrFloatToScalar(a)  SkFloatToScalar(a)
-#define GrIntToScalar(a)    SkIntToScalar(a)
-#define GrScalarAbs(a)      SkScalarAbs(a)
-#define GrScalarIsInt(a)    SkScalarIsInt(a)
-#define GrScalarMax(a,b)    SkScalarMax(a,b)
-#define GrScalarFloorToInt(a)   SkScalarFloor(a)
-#define GrScalarCeilToInt(a)    SkScalarCeil(a)
-#define GrFixedToScalar(a)  SkFixedToScalar(a)
-
-#endif
-
diff --git a/include/gpu/GrUserConfig.h b/include/gpu/GrUserConfig.h
index 7b4e4bb789..3eb77a6891 100644
--- a/include/gpu/GrUserConfig.h
+++ b/include/gpu/GrUserConfig.h
@@ -63,9 +63,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Decide Ganesh types
 
-#define GR_SCALAR_IS_FIXED          0
-#define GR_SCALAR_IS_FLOAT          1
-
 #define GR_TEXT_SCALAR_IS_USHORT    0
 #define GR_TEXT_SCALAR_IS_FIXED     0
 #define GR_TEXT_SCALAR_IS_FLOAT     1