Remove createUncachedTexture function, attempt to recycle scratch in createTexture.

gm/texdata.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.
  */
 
 // This test only works with the GPU backend.
 
@@ skipping 66 matching lines @@
                     }
                 }
 
                 GrSurfaceDesc desc;
                 // use RT flag bit because in GL it makes the texture be bottom-up
                 desc.fFlags     = i ? kRenderTarget_GrSurfaceFlag :
                                       kNone_GrSurfaceFlags;
                 desc.fConfig    = kSkia8888_GrPixelConfig;
                 desc.fWidth     = 2 * S;
                 desc.fHeight    = 2 * S;
-                GrTexture* texture =
-                    ctx->createUncachedTexture(desc, gTextureData.get(), 0);
+                GrTexture* texture = ctx->createTexture(desc, false, gTextureData.get(), 0);
 
                 if (!texture) {
                     return;
                 }
                 SkAutoTUnref<GrTexture> au(texture);
 
                 GrContext::AutoClip acs(ctx, SkRect::MakeWH(2*S, 2*S));
 
                 ctx->setRenderTarget(target);
 
@@ skipping 39 matching lines @@
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new TexDataGM; }
 static GMRegistry reg(MyFactory);
 
 }
 
 #endif