cleanup GrContext resource cache api

tests/ResourceCacheTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #if SK_SUPPORT_GPU
 
 #include "GrContextFactory.h"
 #include "GrResourceCache.h"
 #include "SkGpuDevice.h"
 #include "Test.h"
 
 static const int gWidth = 640;
 static const int gHeight = 480;
 
 ////////////////////////////////////////////////////////////////////////////////
 static void test_cache(skiatest::Reporter* reporter,
                        GrContext* context,
                        SkCanvas* canvas) {
     const SkIRect size = SkIRect::MakeWH(gWidth, gHeight);
 
     SkBitmap src;
     src.allocN32Pixels(size.width(), size.height());
     src.eraseColor(SK_ColorBLACK);
     size_t srcSize = src.getSize();
 
-    size_t initialCacheSize = context->getGpuTextureCacheBytes();
+    size_t initialCacheSize;
+    context->getResourceCacheUsage(NULL, &initialCacheSize);
 
     int oldMaxNum;
     size_t oldMaxBytes;
-    context->getTextureCacheLimits(&oldMaxNum, &oldMaxBytes);
+    context->getResourceCacheLimits(&oldMaxNum, &oldMaxBytes);
 
     // Set the cache limits so we can fit 10 "src" images and the
     // max number of textures doesn't matter
     size_t maxCacheSize = initialCacheSize + 10*srcSize;
-    context->setTextureCacheLimits(1000, maxCacheSize);
+    context->setResourceCacheLimits(1000, maxCacheSize);
 
     SkBitmap readback;
     readback.allocN32Pixels(size.width(), size.height());
 
     for (int i = 0; i < 100; ++i) {
         canvas->drawBitmap(src, 0, 0);
         canvas->readPixels(size, &readback);
 
         // "modify" the src texture
         src.notifyPixelsChanged();
 
-        size_t curCacheSize = context->getGpuTextureCacheBytes();
+        size_t curCacheSize;
+        context->getResourceCacheUsage(NULL, &curCacheSize);
 
         // we should never go over the size limit
         REPORTER_ASSERT(reporter, curCacheSize <= maxCacheSize);
     }
 
-    context->setTextureCacheLimits(oldMaxNum, oldMaxBytes);
+    context->setResourceCacheLimits(oldMaxNum, oldMaxBytes);
 }
 
 class TestResource : public GrCacheable {
     static const size_t kDefaultSize = 100;
 
 public:
     SK_DECLARE_INST_COUNT(TestResource);
     TestResource(size_t size = kDefaultSize)
         : fCache(NULL)
         , fToDelete(NULL)
@@ skipping 232 matching lines @@
         SkCanvas canvas(device.get());
 
         test_cache(reporter, context, &canvas);
         test_purge_invalidated(reporter, context);
         test_cache_delete_on_destruction(reporter, context);
         test_resource_size_changed(reporter, context);
     }
 }
 
 #endif