rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags

tests/WritePixelsTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
@@ skipping 294 matching lines @@
             void* pixels = sk_malloc_throw(size);
             // if rowBytes isn't tight then set the padding to a known value
             if (!c.fTightRowBytes) {
                 memset(pixels, DEV_PAD, size);
             }
             return SkSurface::NewRasterDirectReleaseProc(info, pixels, rowBytes, free_pixels, NULL);
         }
 #if SK_SUPPORT_GPU
         case kGpu_BottomLeft_DevType:
         case kGpu_TopLeft_DevType:
-            GrTextureDesc desc;
-            desc.fFlags = kRenderTarget_GrTextureFlagBit;
+            GrSurfaceDesc desc;
+            desc.fFlags = kRenderTarget_GrSurfaceFlag;
             desc.fWidth = DEV_W;
             desc.fHeight = DEV_H;
             desc.fConfig = kSkia8888_GrPixelConfig;
             desc.fOrigin = kGpu_TopLeft_DevType == c.fDevType ?
                 kTopLeft_GrSurfaceOrigin : kBottomLeft_GrSurfaceOrigin;
             SkAutoTUnref<GrTexture> texture(
                 grCtx->refScratchTexture(desc, GrContext::kExact_ScratchTexMatch));
             return SkSurface::NewRenderTargetDirect(texture->asRenderTarget());
 #endif
     }
@@ skipping 144 matching lines @@
                         SkIRect writeRect = SkIRect::MakeXYWH(rect.fLeft, rect.fTop,
                                                               bmp.width(), bmp.height());
                         bool intersects = SkIRect::Intersects(canvasRect, writeRect) ;
                         REPORTER_ASSERT(reporter, intersects == (idBefore != idAfter));
                     }
                 }
             }
         }
     }
 }