commit 744998e666073166307d2522847b2536000a7619
author bsalomon <bsalomon@google.com> Thu Aug 28 09:54:34 2014 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 28 09:54:34 2014 -0700
tree cba06494229237fb9f8ba5e60a522f1c50b7dd60
parent 7e7136f47d31e88d2d1928933ffb251c156ff02f

Make textures register with GrResourceCache2 as scratch.

R=robertphillips@google.com

Author: bsalomon@google.com

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

src/gpu/GrResourceCache2.cpp

diff --git a/src/gpu/GrResourceCache2.cpp b/src/gpu/GrResourceCache2.cpp
index c325efd..a5732f7 100644
--- a/src/gpu/GrResourceCache2.cpp
+++ b/src/gpu/GrResourceCache2.cpp
@@ -20,11 +20,17 @@
     SkASSERT(!this->isInCache(resource));
     fResources.addToHead(resource);
     ++fCount;
+    if (!resource->getScratchKey().isNullScratch()) {
+        fScratchMap.insert(resource->getScratchKey(), resource);
+    }
 }
 
 void GrResourceCache2::removeResource(GrGpuResource* resource) {
     SkASSERT(this->isInCache(resource));
-    fResources.remove(resource);
+    fResources.remove(resource);    
+    if (!resource->getScratchKey().isNullScratch()) {
+        fScratchMap.remove(resource->getScratchKey(), resource);
+    }
     --fCount;
 }
 
@@ -35,6 +41,7 @@
         // abandon should have already removed this from the list.
         SkASSERT(head != fResources.head());
     }
+    SkASSERT(!fScratchMap.count());
     SkASSERT(!fCount);
 }
 
@@ -45,5 +52,6 @@
         // release should have already removed this from the list.
         SkASSERT(head != fResources.head());
     }
+    SkASSERT(!fScratchMap.count());
     SkASSERT(!fCount);
 }