rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags

include/gpu/GrSurface.h

Index: include/gpu/GrSurface.h
diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h
index 7a7f55dd3bf6c9cc738a8b3f5da78bf0980ca054..9a76d3ab4f8fdb7b6aaa4485d5c2077797000b3d 100644
--- a/include/gpu/GrSurface.h
+++ b/include/gpu/GrSurface.h
@@ -58,7 +58,7 @@ public:
     /**
      * Return the descriptor describing the surface
      */
-    const GrTextureDesc& desc() const { return fDesc; }
+    const GrSurfaceDesc& desc() const { return fDesc; }
 
     /**
      * @return the texture associated with the surface, may be NULL.
@@ -136,12 +136,12 @@ protected:
     // Provides access to methods that should be public within Skia code.
     friend class GrSurfacePriv;
 
-    GrSurface(GrGpu* gpu, bool isWrapped, const GrTextureDesc& desc)
+    GrSurface(GrGpu* gpu, bool isWrapped, const GrSurfaceDesc& desc)
     : INHERITED(gpu, isWrapped)
     , fDesc(desc) {
     }
 
-    GrTextureDesc fDesc;
+    GrSurfaceDesc fDesc;
 
 private:
     typedef GrGpuResource INHERITED;