commit cf0d08e149cfea45b2bc70ec22181315d33ddb3f
author Adlai Holler <adlai@google.com> Tue Aug 11 12:36:10 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Aug 11 12:36:27 2020 +0000
tree de0d98a1b75c0ee4d6ee4f14a4dd74826a22e563
parent 109ff207de7d7846ec9ddcd4230dac47814b2aea

Revert "Migrate GrSurfaceContext readPixels to take direct context"

This reverts commit d169e1915cba8caaddabb22b3672c7cefa91bfa2.

Reason for revert: broke chrome via code generator

Original change's description:
> Migrate GrSurfaceContext readPixels to take direct context
> 
> After this lands we'll proceed up the stack and add the direct
> context requirement to the public API and SkImage.
> 
> Bug: skia:104662
> Change-Id: I4b2d779a7fcd65eec68e631757821ac8e136ddba
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309044
> Commit-Queue: Adlai Holler <adlai@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>

TBR=robertphillips@google.com,adlai@google.com

Change-Id: I6126f2dca4bc902c903512ac486e22841cc472e5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:104662
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309281
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Adlai Holler <adlai@google.com>

tools/gpu/ProxyUtils.cpp

diff --git a/tools/gpu/ProxyUtils.cpp b/tools/gpu/ProxyUtils.cpp
index 0c4b2e3..0bcdbbd 100644
--- a/tools/gpu/ProxyUtils.cpp
+++ b/tools/gpu/ProxyUtils.cpp
@@ -21,17 +21,17 @@
 
 namespace sk_gpu_test {
 
-sk_sp<GrTextureProxy> MakeTextureProxyFromData(GrDirectContext* dContext,
+sk_sp<GrTextureProxy> MakeTextureProxyFromData(GrDirectContext* direct,
                                                GrRenderable renderable,
                                                GrSurfaceOrigin origin,
                                                const GrImageInfo& imageInfo,
                                                const void* data,
                                                size_t rowBytes) {
-    if (dContext->abandoned()) {
+    if (direct->abandoned()) {
         return nullptr;
     }
 
-    const GrCaps* caps = dContext->priv().caps();
+    const GrCaps* caps = direct->priv().caps();
 
     const GrBackendFormat format = caps->getDefaultBackendFormat(imageInfo.colorType(), renderable);
     if (!format.isValid()) {
@@ -40,20 +40,19 @@
     GrSwizzle swizzle = caps->getReadSwizzle(format, imageInfo.colorType());
 
     sk_sp<GrTextureProxy> proxy;
-    proxy = dContext->priv().proxyProvider()->createProxy(format, imageInfo.dimensions(),
-                                                          renderable, 1, GrMipmapped::kNo,
-                                                          SkBackingFit::kExact, SkBudgeted::kYes,
-                                                          GrProtected::kNo);
+    proxy = direct->priv().proxyProvider()->createProxy(format, imageInfo.dimensions(), renderable,
+                                                        1, GrMipmapped::kNo, SkBackingFit::kExact,
+                                                        SkBudgeted::kYes, GrProtected::kNo);
     if (!proxy) {
         return nullptr;
     }
     GrSurfaceProxyView view(proxy, origin, swizzle);
-    auto sContext = GrSurfaceContext::Make(dContext, std::move(view), imageInfo.colorType(),
+    auto sContext = GrSurfaceContext::Make(direct, std::move(view), imageInfo.colorType(),
                                            imageInfo.alphaType(), imageInfo.refColorSpace());
     if (!sContext) {
         return nullptr;
     }
-    if (!sContext->writePixels(dContext, imageInfo, data, rowBytes, {0, 0})) {
+    if (!sContext->writePixels(imageInfo, data, rowBytes, {0, 0}, direct)) {
         return nullptr;
     }
     return proxy;