Rename GrGpuObject to GrGpuResource

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"
@@ skipping 40 matching lines @@
         size_t curCacheSize;
         context->getResourceCacheUsage(NULL, &curCacheSize);
 
         // we should never go over the size limit
         REPORTER_ASSERT(reporter, curCacheSize <= maxCacheSize);
     }
 
     context->setResourceCacheLimits(oldMaxNum, oldMaxBytes);
 }
 
-class TestResource : public GrGpuObject {
+class TestResource : public GrGpuResource {
     static const size_t kDefaultSize = 100;
 
 public:
     SK_DECLARE_INST_COUNT(TestResource);
     TestResource(GrGpu* gpu, size_t size = kDefaultSize)
         : INHERITED(gpu, false)
         , fCache(NULL)
         , fToDelete(NULL)
         , fSize(size) {
         ++fAlive;
@@ skipping 22 matching lines @@
         fCache = cache;
         fToDelete = resource;
     }
 
 private:
     GrResourceCache* fCache;
     TestResource* fToDelete;
     size_t fSize;
     static int fAlive;
 
-    typedef GrGpuObject INHERITED;
+    typedef GrGpuResource INHERITED;
 };
 int TestResource::fAlive = 0;
 
 static void test_purge_invalidated(skiatest::Reporter* reporter, GrContext* context) {
     GrCacheID::Domain domain = GrCacheID::GenerateDomain();
     GrCacheID::Key keyData;
     keyData.fData64[0] = 5;
     keyData.fData64[1] = 18;
     GrResourceKey::ResourceType t = GrResourceKey::GenerateResourceType();
     GrResourceKey key(GrCacheID(domain, keyData), t, 0);
 
     GrResourceCache cache(5, 30000);
 
     // Add two resources with the same key that delete each other from the cache when destroyed.
     TestResource* a = new TestResource(context->getGpu());
     TestResource* b = new TestResource(context->getGpu());
     cache.addResource(key, a);
     cache.addResource(key, b);
     // Circle back.
     a->setDeleteWhenDestroyed(&cache, b);
     b->setDeleteWhenDestroyed(&cache, a);
     a->unref();
     b->unref();
 
     // Add a third independent resource also with the same key.
-    GrGpuObject* r = new TestResource(context->getGpu());
+    GrGpuResource* r = new TestResource(context->getGpu());
     cache.addResource(key, r);
     r->unref();
 
     // Invalidate all three, all three should be purged and destroyed.
     REPORTER_ASSERT(reporter, 3 == TestResource::alive());
     const GrResourceInvalidatedMessage msg = { key };
     SkMessageBus<GrResourceInvalidatedMessage>::Post(msg);
     cache.purgeAsNeeded();
     REPORTER_ASSERT(reporter, 0 == TestResource::alive());
 }
@@ skipping 160 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