commit f2703d83da3ab2ae18b45231fd4f11e16cce3184
author bsalomon <bsalomon@google.com> Tue Oct 28 14:33:06 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Oct 28 14:33:06 2014 -0700
tree 296ec36a08899623dc5808190600f14e08c24107
parent 0ec28af1a7259ef0deec44bd3cba74aafc3c2ad1

rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags

Review URL: https://codereview.chromium.org/682223002

src/gpu/GrLayerCache.cpp

diff --git a/src/gpu/GrLayerCache.cpp b/src/gpu/GrLayerCache.cpp
index ccb5bb0..d897c9d 100644
--- a/src/gpu/GrLayerCache.cpp
+++ b/src/gpu/GrLayerCache.cpp
@@ -104,7 +104,7 @@
 
     SkISize textureSize = SkISize::Make(kAtlasTextureWidth, kAtlasTextureHeight);
     fAtlas.reset(SkNEW_ARGS(GrAtlas, (fContext->getGpu(), kSkia8888_GrPixelConfig,
-                                      kRenderTarget_GrTextureFlagBit,
+                                      kRenderTarget_GrSurfaceFlag,
                                       textureSize, kNumPlotsX, kNumPlotsY, false)));
 }
 
@@ -162,7 +162,7 @@
 }
 
 bool GrLayerCache::tryToAtlas(GrCachedLayer* layer, 
-                              const GrTextureDesc& desc, 
+                              const GrSurfaceDesc& desc, 
                               bool* needsRendering) {
     SkDEBUGCODE(GrAutoValidateLayer avl(fAtlas->getTexture(), layer);)
 
@@ -222,7 +222,7 @@
     return false;
 }
 
-bool GrLayerCache::lock(GrCachedLayer* layer, const GrTextureDesc& desc, bool* needsRendering) {
+bool GrLayerCache::lock(GrCachedLayer* layer, const GrSurfaceDesc& desc, bool* needsRendering) {
     if (layer->locked()) {
         // This layer is already locked
         *needsRendering = false;