rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags

src/gpu/effects/GrTextureStripAtlas.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrTextureStripAtlas.h"
 #include "SkPixelRef.h"
@@ skipping 173 matching lines @@
 }
 
 GrTextureStripAtlas::AtlasRow* GrTextureStripAtlas::getLRU() {
     // Front is least-recently-used
     AtlasRow* row = fLRUFront;
     return row;
 }
 
 void GrTextureStripAtlas::lockTexture() {
     GrTextureParams params;
-    GrTextureDesc texDesc;
+    GrSurfaceDesc texDesc;
     texDesc.fWidth = fDesc.fWidth;
     texDesc.fHeight = fDesc.fHeight;
     texDesc.fConfig = fDesc.fConfig;
 
     static const GrCacheID::Domain gTextureStripAtlasDomain = GrCacheID::GenerateDomain();
     GrCacheID::Key key;
     *key.fData32 = fCacheKey;
     memset(key.fData32 + 1, 0, sizeof(key) - sizeof(uint32_t));
     GrCacheID cacheID(gTextureStripAtlasDomain, key);
 
@@ skipping 133 matching lines @@
 
     // If we have locked rows, we should have a locked texture, otherwise
     // it should be unlocked
     if (fLockedRows == 0) {
         SkASSERT(NULL == fTexture);
     } else {
         SkASSERT(fTexture);
     }
 }
 #endif