Move Budgeted enum out of SkSurface, use in GrTextureProvider

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1728093005
DOCS_PREVIEW= https://skia.org/?cl=1728093005

Committed: https://skia.googlesource.com/skia/+/57599fe6c0336feaeeeb9b1996e77b70219b483c
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot

Review URL: https://codereview.chromium.org/1728093005

11 files changed, 16 insertions, 16 deletions

diff --git a/gm/bleed.cpp b/gm/bleed.cpp
index 85ae2f49d1..1a96fdbfec 100644
--- a/gm/bleed.cpp
+++ b/gm/bleed.cpp
@@ -236,8 +236,8 @@ bool make_oversized_texture_bitmap(GrContext* ctx, TestPixels* result, int width
     desc.fConfig = config;
     desc.fWidth = width + kXPad;
     desc.fHeight = height + kYPad;
-    SkAutoTUnref<GrTexture> texture(ctx->textureProvider()->createTexture(desc, true, pixels.get(),
-                                                                          rowBytes));
+    SkAutoTUnref<GrTexture> texture(ctx->textureProvider()->createTexture(
+            desc, SkBudgeted::kYes, pixels.get(), rowBytes));
 
     if (!texture) {
         return false;
diff --git a/gm/dftext.cpp b/gm/dftext.cpp
index 78b15989e5..cccca3863d 100644
--- a/gm/dftext.cpp
+++ b/gm/dftext.cpp
@@ -51,7 +51,7 @@ protected:
         SkImageInfo info = SkImageInfo::MakeN32Premul(onISize());
         SkSurfaceProps props(SkSurfaceProps::kUseDeviceIndependentFonts_Flag,
                              SkSurfaceProps::kLegacyFontHost_InitType);
-        SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkSurface::kNo_Budgeted,
+        SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkBudgeted::kNo,
                                                                    info, 0, &props));
         SkCanvas* canvas = surface.get() ? surface->getCanvas() : inputCanvas;
         // init our new canvas with the old canvas's matrix
diff --git a/gm/discard.cpp b/gm/discard.cpp
index 85ef382ae7..6f64b9c0b9 100644
--- a/gm/discard.cpp
+++ b/gm/discard.cpp
@@ -45,7 +45,7 @@ protected:
         size.fWidth /= 10;
         size.fHeight /= 10;
         SkImageInfo info = SkImageInfo::MakeN32Premul(size);
-        SkSurface* surface = SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, info);
+        SkSurface* surface = SkSurface::NewRenderTarget(context, SkBudgeted::kNo, info);
 
         if (nullptr == surface) {
             return;
diff --git a/gm/image.cpp b/gm/image.cpp
index e79968a18f..2ddda8f8a4 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -177,7 +177,7 @@ protected:
 
 #if SK_SUPPORT_GPU
         surf2.reset(SkSurface::NewRenderTarget(canvas->getGrContext(),
-                                               SkSurface::kNo_Budgeted, info));
+                                               SkBudgeted::kNo, info));
 #endif
 
         test_surface(canvas, surf0, true);
@@ -262,7 +262,7 @@ static SkImage* make_codec(const SkImageInfo& info, GrContext*, void (*draw)(SkC
 
 static SkImage* make_gpu(const SkImageInfo& info, GrContext* ctx, void (*draw)(SkCanvas*)) {
     if (!ctx) { return nullptr; }
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkSurface::kNo_Budgeted, info));
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkBudgeted::kNo, info));
     draw(surface->getCanvas());
     return surface->newImageSnapshot();
 }
@@ -487,7 +487,7 @@ DEF_SIMPLE_GM(new_texture_image, canvas, 225, 60) {
         // Create a texture image
         [context, render_image]() -> SkImage* {
             SkAutoTUnref<SkSurface> surface(
-                SkSurface::NewRenderTarget(context, SkSurface::kYes_Budgeted,
+                SkSurface::NewRenderTarget(context, SkBudgeted::kYes,
                                            SkImageInfo::MakeN32Premul(kSize, kSize)));
             if (!surface) {
                 return nullptr;
diff --git a/gm/image_pict.cpp b/gm/image_pict.cpp
index a62ffa0c54..968ecda398 100644
--- a/gm/image_pict.cpp
+++ b/gm/image_pict.cpp
@@ -211,7 +211,7 @@ public:
         : SkImageGenerator(info)
         , fCtx(SkRef(ctx))
     {
-        SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkSurface::kNo_Budgeted,
+        SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkBudgeted::kNo,
                                                                    info, 0));
         surface->getCanvas()->clear(0);
         surface->getCanvas()->translate(-100, -100);
@@ -233,7 +233,7 @@ protected:
         desc.fWidth = subset->width();
         desc.fHeight = subset->height();
 
-        GrTexture* dst = fCtx->textureProvider()->createTexture(desc, false);
+        GrTexture* dst = fCtx->textureProvider()->createTexture(desc, SkBudgeted::kNo);
         fCtx->copySurface(dst, fTexture, *subset, SkIPoint::Make(0, 0));
         return dst;
     }
@@ -326,7 +326,7 @@ protected:
         // No API to draw a GrTexture directly, so we cheat and create a private image subclass
         SkAutoTUnref<SkImage> image(new SkImage_Gpu(cache->info().width(), cache->info().height(),
                                                     cache->uniqueID(), kPremul_SkAlphaType, texture,
-                                                    SkSurface::kNo_Budgeted));
+                                                    SkBudgeted::kNo));
         canvas->drawImage(image, x, y);
 #endif
     }
diff --git a/gm/image_shader.cpp b/gm/image_shader.cpp
index 0552c2431c..084bb95a1a 100644
--- a/gm/image_shader.cpp
+++ b/gm/image_shader.cpp
@@ -37,7 +37,7 @@ static SkImage* make_texture(GrContext* ctx, const SkPicture* pic, const SkImage
     if (!ctx) {
         return nullptr;
     }
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkSurface::kNo_Budgeted,
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkBudgeted::kNo,
                                                                info, 0));
     surface->getCanvas()->clear(0);
     surface->getCanvas()->drawPicture(pic);
diff --git a/gm/imagetoyuvplanes.cpp b/gm/imagetoyuvplanes.cpp
index 4883a682f8..09b3dbb98b 100644
--- a/gm/imagetoyuvplanes.cpp
+++ b/gm/imagetoyuvplanes.cpp
@@ -16,7 +16,7 @@ static SkImage* create_image(GrContext* context, int width, int height) {
     SkAutoTUnref<SkSurface> surface;
     SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
     if (context) {
-        surface.reset(SkSurface::NewRenderTarget(context,  SkSurface::kYes_Budgeted, info, 0));
+        surface.reset(SkSurface::NewRenderTarget(context,  SkBudgeted::kYes, info, 0));
     } else {
         surface.reset(SkSurface::NewRaster(info));
     }
diff --git a/gm/surface.cpp b/gm/surface.cpp
index 8c7c118cce..c3eaf9e8d2 100644
--- a/gm/surface.cpp
+++ b/gm/surface.cpp
@@ -33,7 +33,7 @@ static SkSurface* make_surface(GrContext* ctx, const SkImageInfo& info, SkPixelG
 
     SkSurfaceProps props(flags, geo);
     if (ctx) {
-        return SkSurface::NewRenderTarget(ctx, SkSurface::kNo_Budgeted, info, 0, &props);
+        return SkSurface::NewRenderTarget(ctx, SkBudgeted::kNo, info, 0, &props);
     } else {
         return SkSurface::NewRaster(info, &props);
     }
diff --git a/gm/texdata.cpp b/gm/texdata.cpp
index c89ce734f7..4b484cc034 100644
--- a/gm/texdata.cpp
+++ b/gm/texdata.cpp
@@ -70,7 +70,7 @@ DEF_SIMPLE_GM_BG(texdata, canvas, 2 * S, 2 * S, SK_ColorBLACK) {
                 desc.fWidth     = 2 * S;
                 desc.fHeight    = 2 * S;
                 GrTexture* texture = ctx->textureProvider()->createTexture(
-                    desc, false, gTextureData.get(), 0);
+                    desc, SkBudgeted::kNo, gTextureData.get(), 0);
 
                 if (!texture) {
                     return;
diff --git a/gm/textblobmixedsizes.cpp b/gm/textblobmixedsizes.cpp
index 782a85d0d7..330d33f62c 100644
--- a/gm/textblobmixedsizes.cpp
+++ b/gm/textblobmixedsizes.cpp
@@ -99,7 +99,7 @@ protected:
             SkImageInfo info = SkImageInfo::MakeN32Premul(onISize());
             SkSurfaceProps props(SkSurfaceProps::kUseDeviceIndependentFonts_Flag,
                                  SkSurfaceProps::kLegacyFontHost_InitType);
-            surface.reset(SkSurface::NewRenderTarget(ctx, SkSurface::kNo_Budgeted, info, 0,
+            surface.reset(SkSurface::NewRenderTarget(ctx, SkBudgeted::kNo, info, 0,
                                                      &props));
             canvas = surface.get() ? surface->getCanvas() : inputCanvas;
             // init our new canvas with the old canvas's matrix
diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp
index f59e80f757..8c24bf72d1 100644
--- a/gm/xfermodes3.cpp
+++ b/gm/xfermodes3.cpp
@@ -128,7 +128,7 @@ private:
         SkImageInfo baseInfo = baseCanvas->imageInfo();
         SkImageInfo info = SkImageInfo::Make(w, h, baseInfo.colorType(), baseInfo.alphaType(),
                                              baseInfo.profileType());
-        return SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, info, 0, nullptr);
+        return SkSurface::NewRenderTarget(context, SkBudgeted::kNo, info, 0, nullptr);
 #else
         return nullptr;
 #endif