commit 779125d7bc7380585572419dd80d4df55eda829e
author Robert Phillips <robertphillips@google.com> Mon May 24 13:14:39 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon May 24 19:02:45 2021 +0000
tree 4dc0134680a4409566ce9bda7d949811ac90114e
parent e2078f11062c270c1d54d8b777dae73a1bbe124f

Cleanup SkGpuDevice factory functions a bit

This CL:
Clumps the proxy creation & device creation parameters together in the factories
Makes the raw SkGpuDevice factory take a "const SkSurfaceProps&"
Makes both the proxy-wrapping & raw factories call the SDC-based factory

Change-Id: I73fe88b639c015691fbbccdd9ff0acf2f0dad34c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410956
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrOnFlushResourceProvider.cpp

diff --git a/src/gpu/GrOnFlushResourceProvider.cpp b/src/gpu/GrOnFlushResourceProvider.cpp
index e2bcacc..599073e 100644
--- a/src/gpu/GrOnFlushResourceProvider.cpp
+++ b/src/gpu/GrOnFlushResourceProvider.cpp
@@ -32,16 +32,16 @@
         return nullptr;
     }
 
-    auto surfaceDrawContext = GrSurfaceDrawContext::Make(context, colorType, std::move(colorSpace),
-                                                         std::move(proxy), origin, props, true);
+    auto sdc = GrSurfaceDrawContext::Make(context, colorType, std::move(proxy),
+                                          std::move(colorSpace), origin, props, true);
 
-    if (!surfaceDrawContext) {
+    if (!sdc) {
         return nullptr;
     }
 
-    surfaceDrawContext->discard();
+    sdc->discard();
 
-    return surfaceDrawContext;
+    return sdc;
 }
 
 void GrOnFlushResourceProvider::addTextureResolveTask(sk_sp<GrTextureProxy> textureProxy,