remove SkDeviceProperties

src/core/SkGlyphCache.h

Index: src/core/SkGlyphCache.h
diff --git a/src/core/SkGlyphCache.h b/src/core/SkGlyphCache.h
index d0b792f273500afea83fe53ef4c314a676831bc7..136125bd0938ae477e0cc04167af57002f2afd38 100644
--- a/src/core/SkGlyphCache.h
+++ b/src/core/SkGlyphCache.h
@@ -17,7 +17,6 @@
 #include "SkTemplates.h"
 #include "SkTDArray.h"
 
-struct SkDeviceProperties;
 class SkPaint;
 
 class SkGlyphCache_Globals;
@@ -276,7 +275,7 @@ protected:
         fCache = SkGlyphCache::DetachCache(typeface, desc);
     }
     SkAutoGlyphCacheBase(const SkPaint& /*paint*/,
-                         const SkDeviceProperties* /*deviceProperties*/,
+                         const SkSurfaceProps* /*surfaceProps*/,
                          const SkMatrix* /*matrix*/) {
         fCache = NULL;
     }
@@ -301,9 +300,9 @@ public:
     SkAutoGlyphCache(SkTypeface* typeface, const SkDescriptor* desc) :
         SkAutoGlyphCacheBase(typeface, desc) {}
     SkAutoGlyphCache(const SkPaint& paint,
-                     const SkDeviceProperties* deviceProperties,
+                     const SkSurfaceProps* surfaceProps,
                      const SkMatrix* matrix) {
-        fCache = paint.detachCache(deviceProperties, matrix, false);
+        fCache = paint.detachCache(surfaceProps, matrix, false);
     }
 
 private:
@@ -317,9 +316,9 @@ public:
     SkAutoGlyphCacheNoGamma(SkTypeface* typeface, const SkDescriptor* desc) :
         SkAutoGlyphCacheBase(typeface, desc) {}
     SkAutoGlyphCacheNoGamma(const SkPaint& paint,
-                            const SkDeviceProperties* deviceProperties,
+                            const SkSurfaceProps* surfaceProps,
                             const SkMatrix* matrix) {
-        fCache = paint.detachCache(deviceProperties, matrix, true);
+        fCache = paint.detachCache(surfaceProps, matrix, true);
     }
 
 private: