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

src/effects/SkColorCubeFilter.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorCubeFilter.h"
 #include "SkColorPriv.h"
 #include "SkOnce.h"
@@ skipping 336 matching lines @@
     GrContentKey::Builder builder(&key, kDomain, 2);
     builder[0] = fUniqueID;
     builder[1] = fCache.cubeDimension();
     builder.finish();
 
     GrSurfaceDesc desc;
     desc.fWidth = fCache.cubeDimension();
     desc.fHeight = fCache.cubeDimension() * fCache.cubeDimension();
     desc.fConfig = kRGBA_8888_GrPixelConfig;
 
-    SkAutoTUnref<GrTexture> textureCube(context->findAndRefCachedTexture(key));
-    if (!textureCube) {
-        textureCube.reset(context->createTexture(desc, fCubeData->data(), 0));
-        if (textureCube) {
-            SkAssertResult(context->addResourceToCache(key, textureCube));
-        }
+    GrSurface* surface = static_cast<GrSurface*>(context->findAndRefCachedResource(key));
+    SkAutoTUnref<GrTexture> textureCube;
+    if (surface) {
+        textureCube.reset(surface->asTexture());
+    } else {
+        textureCube.reset(context->createTexture(NULL, desc, key, fCubeData->data(), 0));
     }
 
     return textureCube ? GrColorCubeEffect::Create(textureCube) : NULL;
 }
 #endif