SK_SUPPORT_LEGACY_GRTYPES to hide duplicate types from SkTypes.h

include/gpu/GrGlyph.h

Index: include/gpu/GrGlyph.h
diff --git a/include/gpu/GrGlyph.h b/include/gpu/GrGlyph.h
index fe4c835773c3865ddb61a633795a7f0732ab9bca..6de0c57d985cda57dff6372a8457e39ea5044967 100644
--- a/include/gpu/GrGlyph.h
+++ b/include/gpu/GrGlyph.h
@@ -50,22 +50,22 @@ struct GrGlyph {
 
     ///////////////////////////////////////////////////////////////////////////
 
-    static inline unsigned ExtractSubPixelBitsFromFixed(GrFixed pos) {
+    static inline unsigned ExtractSubPixelBitsFromFixed(SkFixed pos) {
         // two most significant fraction bits from fixed-point
         return (pos >> 14) & 3;
     }
 
-    static inline PackedID Pack(uint16_t glyphID, GrFixed x, GrFixed y) {
+    static inline PackedID Pack(uint16_t glyphID, SkFixed x, SkFixed y) {
         x = ExtractSubPixelBitsFromFixed(x);
         y = ExtractSubPixelBitsFromFixed(y);
         return (x << 18) | (y << 16) | glyphID;
     }
 
-    static inline GrFixed UnpackFixedX(PackedID packed) {
+    static inline SkFixed UnpackFixedX(PackedID packed) {
         return ((packed >> 18) & 3) << 14;
     }
 
-    static inline GrFixed UnpackFixedY(PackedID packed) {
+    static inline SkFixed UnpackFixedY(PackedID packed) {
         return ((packed >> 16) & 3) << 14;
     }