| Index: src/gpu/GrGpuResourceCacheAccess.h
|
| diff --git a/src/gpu/GrGpuResourceCacheAccess.h b/src/gpu/GrGpuResourceCacheAccess.h
|
| index aa2337d7f2528645d0e757652ad7bc953a26c14d..867252d7834a2d8331a163c6bd9ff4f2c573a84c 100644
|
| --- a/src/gpu/GrGpuResourceCacheAccess.h
|
| +++ b/src/gpu/GrGpuResourceCacheAccess.h
|
| @@ -33,7 +33,7 @@ public:
|
| * key, and does not have a content key.
|
| */
|
| bool isScratch() const {
|
| - return !this->getContentKey().isValid() && fResource->fScratchKey.isValid() &&
|
| + return !fResource->getContentKey().isValid() && fResource->fScratchKey.isValid() &&
|
| this->isBudgeted();
|
| }
|
|
|
| @@ -51,11 +51,6 @@ public:
|
| void removeScratchKey() const { fResource->removeScratchKey(); }
|
|
|
| /**
|
| - * If the resource is currently cached by a content key, the key is returned, otherwise NULL.
|
| - */
|
| - const GrContentKey& getContentKey() const { return fResource->fContentKey; }
|
| -
|
| - /**
|
| * Is the resource object wrapping an externally allocated GPU resource?
|
| */
|
| bool isWrapped() const { return GrGpuResource::kWrapped_LifeCycle == fResource->fLifeCycle; }
|
| @@ -65,7 +60,7 @@ public:
|
| */
|
| bool isBudgeted() const {
|
| bool ret = GrGpuResource::kCached_LifeCycle == fResource->fLifeCycle;
|
| - SkASSERT(ret || !this->getContentKey().isValid());
|
| + SkASSERT(ret || !fResource->getContentKey().isValid());
|
| return ret;
|
| }
|
|
|
|
|