Add explicit abandoned flag to the GrProxyProvider

In the DDL world it is valid for the GrProxyProvider to not have a
GrResourceProvider so we need a separate marker for abandonment.

Change-Id: Iae18a25226d35e1152a902e17a8091e0058695f3
Reviewed-on: https://skia-review.googlesource.com/97220
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/src/gpu/GrProxyProvider.h b/src/gpu/GrProxyProvider.h
index f0b1bbd1ed..8ddd61ce7c 100644
--- a/src/gpu/GrProxyProvider.h
+++ b/src/gpu/GrProxyProvider.h
@@ -183,11 +183,16 @@ public:
     void abandon() {
         fResourceCache = nullptr;
         fResourceProvider = nullptr;
+        fAbandoned = true;
     }
 
     bool isAbandoned() const {
-        SkASSERT(SkToBool(fResourceCache) == SkToBool(fResourceProvider));
-        return !SkToBool(fResourceCache);
+#ifdef SK_DEBUG
+        if (fAbandoned) {
+            SkASSERT(!fResourceCache && !fResourceProvider);
+        }
+#endif
+        return fAbandoned;
     }
 
     int numUniqueKeyProxies_TestOnly() const;
@@ -212,6 +217,7 @@ private:
 
     GrResourceProvider*    fResourceProvider;
     GrResourceCache*       fResourceCache;
+    bool                   fAbandoned;
     sk_sp<const GrCaps>    fCaps;
 
     // In debug builds we guard against improper thread handling