Revert "GrResourceCache2 manages scratch texture."

This reverts commit d14e1a27643125bfef37fa0ed314b64c1fae22b7.

1 files changed, 1 insertions, 30 deletions

diff --git a/src/gpu/GrResourceCache2.cpp b/src/gpu/GrResourceCache2.cpp
index 1ed66696a7..e0ba26ae83 100644
--- a/src/gpu/GrResourceCache2.cpp
+++ b/src/gpu/GrResourceCache2.cpp
@@ -8,8 +8,7 @@
 
 
 #include "GrResourceCache2.h"
-#include "GrGpuResource.h"  
-#include "SkRefCnt.h"
+#include "GrGpuResource.h"
 
 GrResourceCache2::~GrResourceCache2() {
     this->releaseAll();
@@ -56,31 +55,3 @@ void GrResourceCache2::releaseAll() {
     SkASSERT(!fScratchMap.count());
     SkASSERT(!fCount);
 }
-
-class GrResourceCache2::AvailableForScratchUse {
-public:
-    AvailableForScratchUse(bool calledDuringFlush) : fFlushing(calledDuringFlush) { }
-
-    bool operator()(const GrGpuResource* resource) const {
-        if (fFlushing) {
-            // If this request is coming during draw buffer flush then no refs are allowed
-            // either by drawing code or for pending io operations.
-            // This will be removed when flush no longer creates resources.
-            return resource->reffedOnlyByCache() && !resource->internalHasPendingIO() &&
-                   GrIORef::kYes_IsScratch == resource->fIsScratch;
-        } else {
-            // Because duties are currently shared between GrResourceCache and GrResourceCache2, the
-            // current interpretation of this rule is that only GrResourceCache has a ref but that
-            // it has been marked as a scratch resource.
-            return resource->reffedOnlyByCache() && GrIORef::kYes_IsScratch == resource->fIsScratch;
-        }
-    }
-private:
-    bool fFlushing;
-};
-
-GrGpuResource* GrResourceCache2::findAndRefScratchResource(const GrResourceKey& scratchKey,
-                                                           bool calledDuringFlush) {
-    SkASSERT(scratchKey.isScratch());
-    return SkSafeRef(fScratchMap.find(scratchKey, AvailableForScratchUse(calledDuringFlush)));
-}