Remove image usage type enum. Use GrTextureParams instead.

src/core/SkImageCacherator.h

Index: src/core/SkImageCacherator.h
diff --git a/src/core/SkImageCacherator.h b/src/core/SkImageCacherator.h
index c5c65498cc92ec4653345d63e1bc31562376b11f..1d00117e1851377fd9ccb856ca31333d2d0ba671 100644
--- a/src/core/SkImageCacherator.h
+++ b/src/core/SkImageCacherator.h
@@ -13,6 +13,7 @@
 #include "SkTemplates.h"
 
 class GrContext;
+class GrTextureParams; 
 class SkBitmap;
 class SkImage;
 
@@ -45,7 +46,7 @@ public:
      *
      *  The caller is responsible for calling texture->unref() when they are done.
      */
-    GrTexture* lockAsTexture(GrContext*, SkImageUsageType, const SkImage* client);
+    GrTexture* lockAsTexture(GrContext*, const GrTextureParams&, const SkImage* client);
 
     /**
      *  If the underlying src naturally is represented by an encoded blob (in SkData), this returns
@@ -59,7 +60,7 @@ private:
     bool generateBitmap(SkBitmap*);
     bool tryLockAsBitmap(SkBitmap*, const SkImage*);
 #if SK_SUPPORT_GPU
-    GrTexture* lockUnstretchedTexture(GrContext*, SkImageUsageType, const SkImage* client);
+    GrTexture* lockUnstretchedTexture(GrContext*, const GrTextureParams&, const SkImage* client);
 #endif
 
     class ScopedGenerator {