Revert of Move npot resizing out of GrContext and simplify GrContext texture functions.

tests/GLProgramsTest.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 is a GPU-backend specific test. It relies on static intializers to work
 
@@ skipping 96 matching lines @@
     texDesc.fFlags = kRenderTarget_GrSurfaceFlag;
     texDesc.fConfig = kRGBA_8888_GrPixelConfig;
     texDesc.fOrigin = random->nextBool() == true ? kTopLeft_GrSurfaceOrigin :
                                                    kBottomLeft_GrSurfaceOrigin;
     GrContentKey key;
     static const GrContentKey::Domain kDomain = GrContentKey::GenerateDomain();
     GrContentKey::Builder builder(&key, kDomain, 1);
     builder[0] = texDesc.fOrigin;
     builder.finish();
 
-    GrTexture* texture = context->findAndRefCachedTexture(key);
+    SkAutoTUnref<GrTexture> texture(context->findAndRefTexture(texDesc, key, &params));
     if (!texture) {
-        texture = context->createTexture(texDesc);
-        if (texture) {
-            SkAssertResult(context->addResourceToCache(key, texture));            
+        texture.reset(context->createTexture(&params, texDesc, key, 0, 0));
+        if (!texture) {
+            return NULL;
         }
     }
-    return texture ? texture->asRenderTarget() : NULL;
+    return SkRef(texture->asRenderTarget());
 }
 
 static void set_random_xpf(GrContext* context, const GrDrawTargetCaps& caps,
                            GrPipelineBuilder* pipelineBuilder, SkRandom* random,
                            GrTexture* dummyTextures[]) {
     SkAutoTUnref<const GrXPFactory> xpf(
         GrProcessorTestFactory<GrXPFactory>::CreateStage(random, context, caps, dummyTextures));
     SkASSERT(xpf);
     pipelineBuilder->setXPFactory(xpf.get());
 }
@@ skipping 223 matching lines @@
             }
 #endif
             GrTestTarget target;
             context->getTestTarget(&target);
             REPORTER_ASSERT(reporter, target.target()->programUnitTest(maxStages));
         }
     }
 }
 
 #endif