Revert of Use presence of a content key as non-scratch indicator

src/gpu/GrResourceCache2.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrResourceCache2.h"
@@ skipping 49 matching lines @@
 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() &&
-                   (NULL == resource->getContentKey());
+                   GrGpuResource::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() && (NULL == resource->getContentKey());
+            return resource->reffedOnlyByCache() &&
+                GrGpuResource::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)));
 }