Remove createUncachedTexture function, attempt to recycle scratch in createTexture.

src/gpu/SkGr.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.
  */
 
 #include "SkGr.h"
 
 #include "GrXferProcessor.h"
@@ skipping 161 matching lines @@
     SkASSERT(pixelRef);
     pixelRef->addGenIDChangeListener(SkNEW_ARGS(GrResourceInvalidator, (key)));
 }
 #endif
 
 static GrTexture* create_texture_for_bmp(GrContext* ctx,
                                          const GrContentKey& optionalKey,
                                          GrSurfaceDesc desc,
                                          const void* pixels,
                                          size_t rowBytes) {
-    GrTexture* result;
-    if (optionalKey.isValid() || GrPixelConfigIsCompressed(desc.fConfig)) {
-        result = ctx->createTexture(desc, pixels, rowBytes);
-        if (result) {
-            SkAssertResult(ctx->addResourceToCache(optionalKey, result));
-        }
-    } else {
-        result = ctx->refScratchTexture(desc, GrContext::kExact_ScratchTexMatch);
-        if (pixels && result) {
-            result->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig, pixels, rowBytes);
-        }
+    GrTexture* result = ctx->createTexture(desc, true, pixels, rowBytes);
+    if (result && optionalKey.isValid()) {
+        SkAssertResult(ctx->addResourceToCache(optionalKey, result));
     }
     return result;
 }
 
 // creates a new texture that is the input texture scaled up to the next power of two in
 // width or height. If optionalKey is valid it will be set on the new texture. stretch
 // controls whether the scaling is done using nearest or bilerp filtering.
 GrTexture* resize_texture(GrTexture* inputTexture, Stretch stretch,
                           const GrContentKey& optionalKey) {
     SkASSERT(kNo_Stretch != stretch);
@@ skipping 525 matching lines @@
         if (shader->asFragmentProcessor(context, skPaint, viewM, NULL, &paintColor, &fp) && fp) {
             grPaint->addColorProcessor(fp)->unref();
             constantColor = false;
         }
     }
 
     // The grcolor is automatically set when calling asFragmentProcessor.
     // If the shader can be seen as an effect it returns true and adds its effect to the grpaint.
     SkPaint2GrPaintNoShader(context, skPaint, paintColor, constantColor, grPaint);
 }