rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags

tests/ClipCacheTest.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 "Test.h"
 // This is a GR test
 #if SK_SUPPORT_GPU
 #include "../../src/gpu/GrClipMaskManager.h"
 #include "GrContextFactory.h"
 #include "SkGpuDevice.h"
 
 static const int X_SIZE = 12;
 static const int Y_SIZE = 12;
 
 ////////////////////////////////////////////////////////////////////////////////
 // note: this is unused
 static GrTexture* createTexture(GrContext* context) {
     unsigned char textureData[X_SIZE][Y_SIZE][4];
 
     memset(textureData, 0, 4* X_SIZE * Y_SIZE);
 
-    GrTextureDesc desc;
+    GrSurfaceDesc desc;
 
     // let Skia know we will be using this texture as a render target
-    desc.fFlags     = kRenderTarget_GrTextureFlagBit;
+    desc.fFlags     = kRenderTarget_GrSurfaceFlag;
     desc.fConfig    = kSkia8888_GrPixelConfig;
     desc.fWidth     = X_SIZE;
     desc.fHeight    = Y_SIZE;
 
     // We are initializing the texture with zeros here
     GrTexture* texture = context->createUncachedTexture(desc, textureData, 0);
     if (!texture) {
         return NULL;
     }
 
     return texture;
 }
 
 // Ensure that the 'getConservativeBounds' calls are returning bounds clamped
 // to the render target
 static void test_clip_bounds(skiatest::Reporter* reporter, GrContext* context) {
 
     static const int kXSize = 100;
     static const int kYSize = 100;
 
-    GrTextureDesc desc;
-    desc.fFlags     = kRenderTarget_GrTextureFlagBit;
+    GrSurfaceDesc desc;
+    desc.fFlags     = kRenderTarget_GrSurfaceFlag;
     desc.fConfig    = kAlpha_8_GrPixelConfig;
     desc.fWidth     = kXSize;
     desc.fHeight    = kYSize;
 
     GrTexture* texture = context->createUncachedTexture(desc, NULL, 0);
     if (!texture) {
         return;
     }
 
     SkAutoTUnref<GrTexture> au(texture);
@@ skipping 80 matching lines @@
 
     // check initial state
     check_empty_state(reporter, cache);
 
     // set the current state
     SkIRect bound1;
     bound1.set(0, 0, 100, 100);
 
     SkClipStack clip1(bound1);
 
-    GrTextureDesc desc;
-    desc.fFlags = kRenderTarget_GrTextureFlagBit;
+    GrSurfaceDesc desc;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
     desc.fWidth = X_SIZE;
     desc.fHeight = Y_SIZE;
     desc.fConfig = kSkia8888_GrPixelConfig;
 
     cache.acquireMask(clip1.getTopmostGenID(), desc, bound1);
 
     GrTexture* texture1 = cache.getLastMask();
     REPORTER_ASSERT(reporter, texture1);
     if (NULL == texture1) {
         return;
@@ skipping 61 matching lines @@
         if (NULL == context) {
             continue;
         }
 
         test_cache(reporter, context);
         test_clip_bounds(reporter, context);
     }
 }
 
 #endif