rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags

src/gpu/GrTexturePriv.h

Index: src/gpu/GrTexturePriv.h
diff --git a/src/gpu/GrTexturePriv.h b/src/gpu/GrTexturePriv.h
index a2da946987f5700a369fe555e6e94aeb94e0f42b..d6c2dc2bf8f6d626e717edfdbb426f72bdb15452 100644
--- a/src/gpu/GrTexturePriv.h
+++ b/src/gpu/GrTexturePriv.h
@@ -17,15 +17,15 @@
     implemented privately in GrTexture with a inline public method here). */
 class GrTexturePriv {
 public:
-    void setFlag(GrTextureFlags flags) {
+    void setFlag(GrSurfaceFlags flags) {
         fTexture->fDesc.fFlags = fTexture->fDesc.fFlags | flags;
     }
 
-    void resetFlag(GrTextureFlags flags) {
+    void resetFlag(GrSurfaceFlags flags) {
         fTexture->fDesc.fFlags = fTexture->fDesc.fFlags & ~flags;
     }
 
-    bool isSetFlag(GrTextureFlags flags) const {
+    bool isSetFlag(GrSurfaceFlags flags) const {
         return 0 != (fTexture->fDesc.fFlags & flags);
     }
 
@@ -46,9 +46,9 @@ public:
 
     static GrResourceKey ComputeKey(const GrGpu* gpu,
                                     const GrTextureParams* params,
-                                    const GrTextureDesc& desc,
+                                    const GrSurfaceDesc& desc,
                                     const GrCacheID& cacheID);
-    static GrResourceKey ComputeScratchKey(const GrTextureDesc& desc);
+    static GrResourceKey ComputeScratchKey(const GrSurfaceDesc& desc);
     static bool NeedsResizing(const GrResourceKey& key);
     static bool NeedsBilerp(const GrResourceKey& key);