rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags

src/gpu/gl/GrGLTexture.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrGLTexture_DEFINED
 #define GrGLTexture_DEFINED
@@ skipping 39 matching lines @@
 public:
     struct TexParams {
         GrGLenum fMinFilter;
         GrGLenum fMagFilter;
         GrGLenum fWrapS;
         GrGLenum fWrapT;
         GrGLenum fSwizzleRGBA[4];
         void invalidate() { memset(this, 0xff, sizeof(TexParams)); }
     };
 
-    struct Desc : public GrTextureDesc {
+    struct Desc : public GrSurfaceDesc {
         GrGLuint        fTextureID;
         bool            fIsWrapped;
     };
 
     // creates a texture that is also an RT
     GrGLTexture(GrGpuGL* gpu,
                 const Desc& textureDesc,
                 const GrGLRenderTarget::Desc& rtDesc);
 
     // creates a non-RT texture
@@ skipping 31 matching lines @@
     SkAutoTUnref<GrGLTexID>         fTexIDObj;
 
     void init(GrGpuGL* gpu,
               const Desc& textureDesc,
               const GrGLRenderTarget::Desc* rtDesc);
 
     typedef GrTexture INHERITED;
 };
 
 #endif