Correct accounting for wrapped resources

BUG=skia:2889

Review URL: https://codereview.chromium.org/720033004

1 files changed, 9 insertions, 0 deletions

diff --git a/src/gpu/GrGpuResource.cpp b/src/gpu/GrGpuResource.cpp
index fcc5f4de50..ea3756b8dd 100644
--- a/src/gpu/GrGpuResource.cpp
+++ b/src/gpu/GrGpuResource.cpp
@@ -87,6 +87,11 @@ bool GrGpuResource::setContentKey(const GrResourceKey& contentKey) {
     // Currently this can only be called once and can't be called when the resource is scratch.
     SkASSERT(!contentKey.isScratch());
     SkASSERT(this->internalHasRef());
+
+    // Wrapped resources can never have a key.
+    if (this->isWrapped()) {
+        return false;
+    }
     
     if (fContentKeySet || this->wasDestroyed()) {
         return false;
@@ -116,6 +121,10 @@ void GrGpuResource::setScratchKey(const GrResourceKey& scratchKey) {
     SkASSERT(fScratchKey.isNullScratch());
     SkASSERT(scratchKey.isScratch());
     SkASSERT(!scratchKey.isNullScratch());
+    // Wrapped resources can never have a key.
+    if (this->isWrapped()) {
+        return;
+    }
     fScratchKey = scratchKey;
 }