commit e5f73281f9cdda59f8a55c6a65bf171dca142037
author Robert Phillips <robertphillips@google.com> Tue Jun 18 17:15:04 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jun 19 00:01:51 2019 +0000
tree 19bfaa426150a4e9ce5fe7a021121c46dd018226
parent f0095cf86ac0315272c193afb59dd62c2900da31

No longer forward refs and unrefs from the GrSurfaceProxy to the backing GrSurface

This is setting up for GrIORefProxy to just become SkRefCnt and GrProxyRef to just become sk_sp.

Change-Id: Ica66565a353de980a7070e0788f1f2b17565baee
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/220297
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/GrProxyProvider.cpp

diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp
index ee8ab36..7a3c966 100644
--- a/src/gpu/GrProxyProvider.cpp
+++ b/src/gpu/GrProxyProvider.cpp
@@ -103,17 +103,12 @@
     }
 
     GrTextureProxy* proxy = fUniquelyKeyedProxies.find(key);
-    sk_sp<GrTextureProxy> result;
     if (proxy) {
-        GrResourceCache* cache = nullptr;
-        if (auto directContext = fImageContext->priv().asDirectContext()) {
-            cache = directContext->priv().getResourceCache();
-        }
-        proxy->firstRefAccess().ref(cache);
-        result.reset(proxy);
-        SkASSERT(result->origin() == origin);
+        SkASSERT(proxy->getProxyRefCnt() >= 1);
+        SkASSERT(proxy->origin() == origin);
+        return sk_ref_sp(proxy);
     }
-    return result;
+    return nullptr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////