Make uncached textures uncached from the get go.

src/gpu/GrGpuResourceCacheAccess.h

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGpuResourceCacheAccess_DEFINED
 #define GrGpuResourceCacheAccess_DEFINED
@@ skipping 11 matching lines @@
      * be converted to a content resource. Currently this may only be called once per resource. It
      * fails if there is already a resource with the same content key. TODO: make this supplant the
      * resource that currently is using the content key, allow resources' content keys to change,
      * and allow removal of a content key to convert a resource back to scratch.
      */
     bool setContentKey(const GrResourceKey& contentKey) {
         return fResource->setContentKey(contentKey);
     }
 
     /**
-     * Changes whether the resource counts against the resource cache budget.
-     */
-    void setBudgeted(bool countsAgainstBudget) { fResource->setBudgeted(countsAgainstBudget); }
-
-    /**
      * Is the resource currently cached as scratch? This means it has a valid scratch key and does
      * not have a content key.
      */
     bool isScratch() const {
         return NULL == this->getContentKey() && fResource->fScratchKey.isValid();
     }
 
     /** 
      * If this resource can be used as a scratch resource this returns a valid scratch key.
      * Otherwise it returns a key for which isNullScratch is true. The resource may currently be
@@ skipping 13 matching lines @@
     const GrResourceKey* getContentKey() const {
         if (fResource->fFlags & GrGpuResource::kContentKeySet_Flag) {
             return &fResource->fContentKey;
         }
         return NULL;
     }
 
     /**
      * Is the resource object wrapping an externally allocated GPU resource?
      */
-    bool isWrapped() const { return fResource->isWrapped(); }
+    bool isWrapped() const { return GrGpuResource::kWrapped_LifeCycle == fResource->fLifeCycle; }
 
     /**
      * Does the resource count against the resource budget?
      */
-    bool isBudgeted() const { 
-        bool ret = SkToBool(GrGpuResource::kBudgeted_Flag & fResource->fFlags);
-        SkASSERT(!(ret && fResource->isWrapped()));
-        return ret;
-    }
+    bool isBudgeted() const { return GrGpuResource::kCached_LifeCycle == fResource->fLifeCycle; }
 
     /**
      * Called by the cache to delete the resource under normal circumstances.
      */
     void release() {
         fResource->release();
         if (fResource->isPurgable()) {            
             SkDELETE(fResource);
         }
     }
@@ skipping 22 matching lines @@
     friend class GrGpuResource; // to construct/copy this type.
 };
 
 inline GrGpuResource::CacheAccess GrGpuResource::cacheAccess() { return CacheAccess(this); }
 
 inline const GrGpuResource::CacheAccess GrGpuResource::cacheAccess() const {
     return CacheAccess(const_cast<GrGpuResource*>(this));
 }
 
 #endif