rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags

src/gpu/SkGrPixelRef.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 44 matching lines @@
 
 static SkGrPixelRef* copy_to_new_texture_pixelref(GrTexture* texture, SkColorType dstCT,
                                                   const SkIRect* subset) {
     if (NULL == texture || kUnknown_SkColorType == dstCT) {
         return NULL;
     }
     GrContext* context = texture->getContext();
     if (NULL == context) {
         return NULL;
     }
-    GrTextureDesc desc;
+    GrSurfaceDesc desc;
 
     SkIRect srcRect;
 
     if (!subset) {
         desc.fWidth  = texture->width();
         desc.fHeight = texture->height();
         srcRect = SkIRect::MakeWH(texture->width(), texture->height());
     } else {
         SkASSERT(SkIRect::MakeWH(texture->width(), texture->height()).contains(*subset));
         // Create a new texture that is the size of subset.
         desc.fWidth = subset->width();
         desc.fHeight = subset->height();
         srcRect = *subset;
     }
-    desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag | kNoStencil_GrSurfaceFlag;
     desc.fConfig = SkImageInfo2GrPixelConfig(dstCT, kPremul_SkAlphaType);
 
     GrTexture* dst = context->createUncachedTexture(desc, NULL, 0);
     if (NULL == dst) {
         return NULL;
     }
 
     // Blink is relying on the above copy being sent to GL immediately in the case when the source
     // is a WebGL canvas backing store. We could have a TODO to remove this flush flag, but we have
     // a larger TODO to remove SkGrPixelRef entirely.
@@ skipping 97 matching lines @@
         cachedBitmap.setImmutable();
         //Add to the cache
         SkBitmapCache::Add(this->getGenerationID(), bounds, cachedBitmap);
 
         dst->swap(cachedBitmap);
     }
 
     return true;
 
 }