commit 9b6e30bd673858b2ee0c66ee1af8238895285e86
author Greg Daniel <egdaniel@google.com> Wed Mar 10 12:45:36 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Mar 10 20:53:23 2021 +0000
tree d328d97144b32d9e1b407face86a84a5c693c365
parent 93330c9c4dc78f2b84e72f160b5f9bd20d22f0fd

Fix deleting of GrGpuResource when abanonded and refs go to zero.

Abandoning would cause us to unref all the command buffer usages, but
then in notifyARefIsZero we would delete the abandoned resources even
though we still had a real ref. Then when that ref went away we would
crash.

Change-Id: I05dc2ba9a67c35c36a36704f4b81d6eef4e860e6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/382916
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/GrGpuResource.cpp

diff --git a/src/gpu/GrGpuResource.cpp b/src/gpu/GrGpuResource.cpp
index 716dfa8..7a40bf5 100644
--- a/src/gpu/GrGpuResource.cpp
+++ b/src/gpu/GrGpuResource.cpp
@@ -160,8 +160,10 @@
 
 void GrGpuResource::notifyARefCntIsZero(LastRemovedRef removedRef) const {
     if (this->wasDestroyed()) {
-        // We've already been removed from the cache. Goodbye cruel world!
-        delete this;
+        if (this->hasNoCommandBufferUsages() && !this->hasRef()) {
+            // We've already been removed from the cache. Goodbye cruel world!
+            delete this;
+        }
         return;
     }