rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags

src/gpu/GrClipMaskCache.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrClipMaskCache_DEFINED
 #define GrClipMaskCache_DEFINED
 
@@ skipping 96 matching lines @@
             SkASSERT(false);
             return NULL;
         }
 
         GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
 
         return back->fLastMask;
     }
 
     void acquireMask(int32_t clipGenID,
-                     const GrTextureDesc& desc,
+                     const GrSurfaceDesc& desc,
                      const SkIRect& bound) {
 
         if (fStack.empty()) {
             SkASSERT(false);
             return;
         }
 
         GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
 
         back->acquireMask(fContext, clipGenID, desc, bound);
@@ skipping 64 matching lines @@
 
 private:
     struct GrClipStackFrame {
 
         GrClipStackFrame() {
             this->reset();
         }
 
         void acquireMask(GrContext* context,
                          int32_t clipGenID,
-                         const GrTextureDesc& desc,
+                         const GrSurfaceDesc& desc,
                          const SkIRect& bound) {
 
             fLastClipGenID = clipGenID;
 
             // HACK: set the last param to true to indicate that this request is at
             // flush time and therefore we require a scratch texture with no pending IO operations.
             fLastMask.reset(context->refScratchTexture(desc, GrContext::kApprox_ScratchTexMatch,
                                                        /*flushing=*/true));
 
             fLastBound = bound;
         }
 
         void reset () {
             fLastClipGenID = SkClipStack::kInvalidGenID;
 
-            GrTextureDesc desc;
+            GrSurfaceDesc desc;
 
             fLastMask.reset(NULL);
             fLastBound.setEmpty();
         }
 
         int32_t                 fLastClipGenID;
         // The mask's width & height values are used by GrClipMaskManager to correctly scale the
         // texture coords for the geometry drawn with this mask. TODO: This should be a cache key
         // and not a hard ref to a texture.
         SkAutoTUnref<GrTexture> fLastMask;
         // fLastBound stores the bounding box of the clip mask in clip-stack space. This rect is
         // used by GrClipMaskManager to position a rect and compute texture coords for the mask.
         SkIRect                 fLastBound;
     };
 
     GrContext*   fContext;
     SkDeque      fStack;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif // GrClipMaskCache_DEFINED