commit 6d3fe022d68fd6dd32c0fab30e24fa5a4f048946
author bsalomon <bsalomon@google.com> Fri Jul 25 08:35:45 2014 -0700
committer Commit bot <commit-bot@chromium.org> Fri Jul 25 08:35:45 2014 -0700
tree 7af60205eeb7a7644e1bf4a8edfa0b1545619b0a
parent 570c392a0056115e103b42c373a61e4e152ea92c

Rename GrGpuObject to GrGpuResource

R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/418143004

bench/GrResourceCacheBench.cpp

diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp
index b8eacd6..84e0e5d 100644
--- a/bench/GrResourceCacheBench.cpp
+++ b/bench/GrResourceCacheBench.cpp
@@ -9,7 +9,7 @@
 #if SK_SUPPORT_GPU
 
 #include "Benchmark.h"
-#include "GrGpuObject.h"
+#include "GrGpuResource.h"
 #include "GrContext.h"
 #include "GrResourceCache.h"
 #include "GrStencilBuffer.h"
@@ -21,7 +21,7 @@
     CACHE_SIZE_BYTES = 2 * 1024 * 1024,
 };
 
-class StencilResource : public GrGpuObject {
+class StencilResource : public GrGpuResource {
 public:
     SK_DECLARE_INST_COUNT(StencilResource);
     StencilResource(GrGpu* gpu, int id)
@@ -42,10 +42,10 @@
     int fID;
 
 private:
-    typedef GrGpuObject INHERITED;
+    typedef GrGpuResource INHERITED;
 };
 
-class TextureResource : public GrGpuObject {
+class TextureResource : public GrGpuResource {
 public:
     SK_DECLARE_INST_COUNT(TextureResource);
     TextureResource(GrGpu* gpu, int id)
@@ -66,7 +66,7 @@
     int fID;
 
 private:
-    typedef GrGpuObject INHERITED;
+    typedef GrGpuResource INHERITED;
 };
 
 static void get_stencil(int i, int* w, int* h, int* s) {
@@ -89,7 +89,7 @@
         int w, h, s;
         get_stencil(i, &w, &h, &s);
         GrResourceKey key = GrStencilBuffer::ComputeKey(w, h, s);
-        GrGpuObject* resource = SkNEW_ARGS(StencilResource, (gpu, i));
+        GrGpuResource* resource = SkNEW_ARGS(StencilResource, (gpu, i));
         cache->purgeAsNeeded(1, resource->gpuMemorySize());
         cache->addResource(key, resource);
         resource->unref();
@@ -99,7 +99,7 @@
         GrTextureDesc desc;
         get_texture_desc(i, &desc);
         GrResourceKey key =  TextureResource::ComputeKey(desc);
-        GrGpuObject* resource = SkNEW_ARGS(TextureResource, (gpu, i));
+        GrGpuResource* resource = SkNEW_ARGS(TextureResource, (gpu, i));
         cache->purgeAsNeeded(1, resource->gpuMemorySize());
         cache->addResource(key, resource);
         resource->unref();
@@ -112,7 +112,7 @@
         GrTextureDesc desc;
         get_texture_desc(k, &desc);
         GrResourceKey key = TextureResource::ComputeKey(desc);
-        GrGpuObject* item = cache->find(key);
+        GrGpuResource* item = cache->find(key);
         if (NULL == item) {
             SkFAIL("cache add does not work as expected");
             return;
@@ -126,7 +126,7 @@
         int w, h, s;
         get_stencil(k, &w, &h, &s);
         GrResourceKey key = StencilResource::ComputeKey(w, h, s);
-        GrGpuObject* item = cache->find(key);
+        GrGpuResource* item = cache->find(key);
         if (NULL == item) {
             SkFAIL("cache add does not work as expected");
             return;
@@ -143,7 +143,7 @@
         get_texture_desc(k, &desc);
         desc.fHeight |= 1;
         GrResourceKey key = TextureResource::ComputeKey(desc);
-        GrGpuObject* item = cache->find(key);
+        GrGpuResource* item = cache->find(key);
         if (NULL != item) {
             SkFAIL("cache add does not work as expected");
             return;
@@ -154,7 +154,7 @@
         get_stencil(k, &w, &h, &s);
         h |= 1;
         GrResourceKey key = StencilResource::ComputeKey(w, h, s);
-        GrGpuObject* item = cache->find(key);
+        GrGpuResource* item = cache->find(key);
         if (NULL != item) {
             SkFAIL("cache add does not work as expected");
             return;