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

src/gpu/GrTextureProvider.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrTextureProvider.h"
 #include "GrTexturePriv.h"
 #include "GrResourceCache.h"
@@ skipping 11 matching lines @@
 
 GrTextureProvider::GrTextureProvider(GrGpu* gpu, GrResourceCache* cache, GrSingleOwner* singleOwner)
     : fCache(cache)
     , fGpu(gpu)
 #ifdef SK_DEBUG
     , fSingleOwner(singleOwner)
 #endif
     {
 }
 
-GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted,
+GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budgeted,
                                             const void* srcData, size_t rowBytes) {
     ASSERT_SINGLE_OWNER
     if (this->isAbandoned()) {
         return nullptr;
     }
     if ((desc.fFlags & kRenderTarget_GrSurfaceFlag) &&
         !fGpu->caps()->isConfigRenderable(desc.fConfig, desc.fSampleCnt > 0)) {
         return nullptr;
     }
     if (!GrPixelConfigIsCompressed(desc.fConfig) &&
         !desc.fTextureStorageAllocator.fAllocateTextureStorage) {
         static const uint32_t kFlags = kExact_ScratchTextureFlag |
                                        kNoCreate_ScratchTextureFlag;
         if (GrTexture* texture = this->refScratchTexture(desc, kFlags)) {
             if (!srcData || texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
                                                  srcData, rowBytes)) {
-                if (SkBudgeted::kNo == budgeted) {
+                if (!budgeted) {
                     texture->resourcePriv().makeUnbudgeted();
                 }
                 return texture;
             }
             texture->unref();
         }
     }
     return fGpu->createTexture(desc, budgeted, srcData, rowBytes);
 }
 
@@ skipping 50 matching lines @@
             GrSurface* surface = static_cast<GrSurface*>(resource);
             GrRenderTarget* rt = surface->asRenderTarget();
             if (rt && fGpu->caps()->discardRenderTargetSupport()) {
                 rt->discard();
             }
             return surface->asTexture();
         }
     }
 
     if (!(kNoCreate_ScratchTextureFlag & flags)) {
-        return fGpu->createTexture(*desc, SkBudgeted::kYes, nullptr, 0);
+        return fGpu->createTexture(*desc, true, nullptr, 0);
     }
 
     return nullptr;
 }
 
 GrTexture* GrTextureProvider::wrapBackendTexture(const GrBackendTextureDesc& desc,
                                                  GrWrapOwnership ownership) {
     ASSERT_SINGLE_OWNER
     if (this->isAbandoned()) {
         return nullptr;
@@ skipping 28 matching lines @@
 GrTexture* GrTextureProvider::findAndRefTextureByUniqueKey(const GrUniqueKey& key) {
     ASSERT_SINGLE_OWNER
     GrGpuResource* resource = this->findAndRefResourceByUniqueKey(key);
     if (resource) {
         GrTexture* texture = static_cast<GrSurface*>(resource)->asTexture();
         SkASSERT(texture);
         return texture;
     }
     return NULL;
 }