Make GrResourceCache2 responsible for calling release, abandon, and ~.

bench/GrResourceCacheBench.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.
  */
 
 #include "Benchmark.h"
 
@@ skipping 15 matching lines @@
 
 class StencilResource : public GrGpuResource {
 public:
     SK_DECLARE_INST_COUNT(StencilResource);
     StencilResource(GrGpu* gpu, int id)
         : INHERITED(gpu, false)
         , fID(id) {
         this->registerWithCache();
     }
 
-    virtual ~StencilResource() { this->release(); }
-
     static GrResourceKey ComputeKey(int width, int height, int sampleCnt) {
         return GrStencilBuffer::ComputeKey(width, height, sampleCnt);
     }
 
     int fID;
 
 private:
     virtual size_t onGpuMemorySize() const SK_OVERRIDE {
         return 100 + ((fID % 1 == 0) ? -5 : 6);
     }
 
     typedef GrGpuResource INHERITED;
 };
 
 class TextureResource : public GrGpuResource {
 public:
     SK_DECLARE_INST_COUNT(TextureResource);
     TextureResource(GrGpu* gpu, int id)
         : INHERITED(gpu, false)
         , fID(id) {
         this->registerWithCache();
     }
 
-    virtual ~TextureResource() { this->release(); }
-
     static GrResourceKey ComputeKey(const GrSurfaceDesc& desc) {
         GrCacheID::Key key;
         memset(&key, 0, sizeof(key));
         key.fData32[0] = (desc.fWidth) | (desc.fHeight << 16);
         key.fData32[1] = desc.fConfig | desc.fSampleCnt << 16;
         key.fData32[2] = desc.fFlags;
         static int gType = GrResourceKey::GenerateResourceType();
         static int gDomain = GrCacheID::GenerateDomain();
         return GrResourceKey(GrCacheID(gDomain, key), gType, 0);
     }
@@ skipping 187 matching lines @@
     }
 
 private:
     typedef Benchmark INHERITED;
 };
 
 DEF_BENCH( return new GrResourceCacheBenchAdd(); )
 DEF_BENCH( return new GrResourceCacheBenchFind(); )
 
 #endif