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/GrProxyProvider.cpp

diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp
index 8ec7265..d1a57ce 100644
--- a/src/gpu/GrProxyProvider.cpp
+++ b/src/gpu/GrProxyProvider.cpp
@@ -246,7 +246,7 @@
     if (proxy->asRenderTargetProxy()) {
         GrBackendFormat expectedFormat;
         std::tie(ct, expectedFormat) =
-                GrSurfaceFillContext::GetFallbackColorTypeAndFormat(fImageContext, ct, sampleCnt);
+                GrSurfaceDrawContext::GetFallbackColorTypeAndFormat(fImageContext, ct, sampleCnt);
         SkASSERT(expectedFormat == proxy->backendFormat());
     }
     GrSwizzle swizzle = fImageContext->priv().caps()->getReadSwizzle(proxy->backendFormat(), ct);