commit 0263bff0d2968befe786c25f6ba33ea1b12b0b98
author Brian Salomon <bsalomon@google.com> Wed Dec 16 08:41:39 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 16 14:49:56 2020 +0000
tree e20377ffafd0506611648a980f191b1068ce4523
parent fcd68167a2612206c059dd2130ffadd0e4db517e

Revert "Add GrSurfaceFillContext"

This reverts commit b339bbe9dcbfea25b08539ebe3d8c5ec9a868e42.


Revert "Make backend allocation tests avoid alphatype conversions"

This reverts commit 177af6f4102c431e17999ec90afa3e18bacdd8b1.

Bug: skia:11019
Change-Id: Id80aa7df4a15c8530a609c49ca6264bce7831852
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/344569
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrSurfaceProxy.cpp

diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp
index 072ffb3..a588da3 100644
--- a/src/gpu/GrSurfaceProxy.cpp
+++ b/src/gpu/GrSurfaceProxy.cpp
@@ -291,19 +291,19 @@
         }
     }
     if (src->asTextureProxy()) {
-        GrImageInfo info(GrColorType::kUnknown, kUnknown_SkAlphaType, nullptr, {width, height});
-        auto dstContext = GrSurfaceFillContext::Make(context,
-                                                     kUnknown_SkAlphaType,
+        auto dstContext = GrSurfaceDrawContext::Make(context,
                                                      nullptr,
-                                                     {width, height},
                                                      fit,
+                                                     {width, height},
                                                      format,
-                                                     1,
+                                                     /* sample count*/ 1,
                                                      mipMapped,
                                                      src->isProtected(),
                                                      GrSwizzle::RGBA(),
                                                      GrSwizzle::RGBA(),
-                                                     origin);
+                                                     origin,
+                                                     budgeted,
+                                                     /*surface props*/ nullptr);
         GrSurfaceProxyView view(sk_ref_sp(src), origin, GrSwizzle::RGBA());
         if (dstContext && dstContext->blitTexture(std::move(view), srcRect, dstPoint)) {
             return dstContext->asSurfaceProxyRef();