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

src/core/SkPictureImageGenerator.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 "SkImageGenerator.h"
 #include "SkCanvas.h"
 #include "SkMatrix.h"
@@ skipping 120 matching lines @@
 #if SK_SUPPORT_GPU
 #include "GrTexture.h"
 
 GrTexture* SkPictureImageGenerator::onGenerateTexture(GrContext* ctx, const SkIRect* subset) {
     const SkImageInfo& info = this->getInfo();
     SkImageInfo surfaceInfo = subset ? info.makeWH(subset->width(), subset->height()) : info;
 
     //
     // TODO: respect the usage, by possibly creating a different (pow2) surface
     //
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkBudgeted::kYes,
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx,
+                                                               SkSurface::kYes_Budgeted,
                                                                surfaceInfo));
     if (!surface.get()) {
         return nullptr;
     }
 
     SkMatrix matrix = fMatrix;
     if (subset) {
         matrix.postTranslate(-subset->x(), -subset->y());
     }
     surface->getCanvas()->clear(0); // does NewRenderTarget promise to do this for us?
     surface->getCanvas()->drawPicture(fPicture, &matrix, fPaint.getMaybeNull());
     SkAutoTUnref<SkImage> image(surface->newImageSnapshot());
     if (!image.get()) {
         return nullptr;
     }
     return SkSafeRef(image->getTexture());
 }
 #endif