Revert of Move Budgeted enum out of SkSurface, use in GrTextureProvider

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
 
 #include "GrGpuResource.h"
 #include "GrGpuResourcePriv.h"
 
 namespace skiatest {
     class Reporter;
 }
 
 /**
  * This class allows GrResourceCache increased privileged access to GrGpuResource objects.
  */
 class GrGpuResource::CacheAccess {
 private:
     /**
      * Is the resource currently cached as scratch? This means it is cached, has a valid scratch
      * key, and does not have a unique key.
      */
     bool isScratch() const {
         return !fResource->getUniqueKey().isValid() && fResource->fScratchKey.isValid() &&
-                SkBudgeted::kYes == fResource->resourcePriv().isBudgeted();
+                fResource->resourcePriv().isBudgeted();
     }
 
     /**
      * Is the resource object wrapping an externally allocated GPU resource?
      */
     bool isExternal() const { return fResource->isExternal(); }
 
     /**
      * Is the resource object wrapping an externally allocated GPU resource that Skia has not taken
      * ownership of.
@@ skipping 52 matching lines @@
     friend void test_unbudgeted_to_scratch(skiatest::Reporter* reporter); // for unit testing
 };
 
 inline GrGpuResource::CacheAccess GrGpuResource::cacheAccess() { return CacheAccess(this); }
 
 inline const GrGpuResource::CacheAccess GrGpuResource::cacheAccess() const {
     return CacheAccess(const_cast<GrGpuResource*>(this));
 }
 
 #endif