rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags

src/gpu/GrAtlas.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrAtlas_DEFINED
 #define GrAtlas_DEFINED
@@ skipping 75 matching lines @@
             return fPlots.contains(const_cast<GrPlot*>(plot)); 
         }
 #endif
 
     private:
         SkTDArray<GrPlot*> fPlots;
 
         friend class GrAtlas;
     };
 
-    GrAtlas(GrGpu*, GrPixelConfig, GrTextureFlags flags, 
+    GrAtlas(GrGpu*, GrPixelConfig, GrSurfaceFlags flags, 
             const SkISize& backingTextureSize,
             int numPlotsX, int numPlotsY, bool batchUploads);
     ~GrAtlas();
 
     // Adds a width x height subimage to the atlas. Upon success it returns 
     // the containing GrPlot and absolute location in the backing texture. 
     // NULL is returned if the subimage cannot fit in the atlas.
     // If provided, the image data will either be immediately uploaded or
     // written to the CPU-side backing bitmap.
     GrPlot* addToAtlas(ClientPlotUsage*, int width, int height, const void* image, SkIPoint16* loc);
@@ skipping 21 matching lines @@
         return iter->init(fPlotList, kLRUFirst_IterOrder == order 
                                                        ? GrPlotList::Iter::kTail_IterStart
                                                        : GrPlotList::Iter::kHead_IterStart);
     }
 
 private:
     void makeMRU(GrPlot* plot);
 
     GrGpu*         fGpu;
     GrPixelConfig  fPixelConfig;
-    GrTextureFlags fFlags;
+    GrSurfaceFlags fFlags;
     GrTexture*     fTexture;
     SkISize        fBackingTextureSize;
     int            fNumPlotsX;
     int            fNumPlotsY;
     bool           fBatchUploads;
 
     // allocated array of GrPlots
     GrPlot*       fPlotArray;
     // LRU list of GrPlots (MRU at head - LRU at tail)
     GrPlotList    fPlotList;
 };
 
 #endif