Remove AutoScratchTexture

src/gpu/GrClipMaskCache.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrClipMaskCache_DEFINED
 #define GrClipMaskCache_DEFINED
 
@@ skipping 22 matching lines @@
 
     bool canReuse(int32_t clipGenID, const SkIRect& bounds) {
 
         SkASSERT(clipGenID != SkClipStack::kWideOpenGenID);
         SkASSERT(clipGenID != SkClipStack::kEmptyGenID);
 
         GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
 
         // We could reuse the mask if bounds is a subset of last bounds. We'd have to communicate
         // an offset to the caller.
-        if (back->fLastMask.texture() &&
-            !back->fLastMask.texture()->wasDestroyed() &&
+        if (back->fLastMask &&
+            !back->fLastMask->wasDestroyed() &&
             back->fLastBound == bounds &&
             back->fLastClipGenID == clipGenID) {
             return true;
         }
 
         return false;
     }
 
     void reset() {
         if (fStack.empty()) {
@@ skipping 36 matching lines @@
 
     GrTexture* getLastMask() {
 
         if (fStack.empty()) {
             SkASSERT(false);
             return NULL;
         }
 
         GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
 
-        return back->fLastMask.texture();
+        return back->fLastMask;
     }
 
     const GrTexture* getLastMask() const {
 
         if (fStack.empty()) {
             SkASSERT(false);
             return NULL;
         }
 
         GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
 
-        return back->fLastMask.texture();
+        return back->fLastMask;
     }
 
     void acquireMask(int32_t clipGenID,
                      const GrTextureDesc& desc,
                      const SkIRect& bound) {
 
         if (fStack.empty()) {
             SkASSERT(false);
             return;
         }
 
         GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
 
         back->acquireMask(fContext, clipGenID, desc, bound);
     }
 
     int getLastMaskWidth() const {
 
         if (fStack.empty()) {
             SkASSERT(false);
             return -1;
         }
 
         GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
 
-        if (NULL == back->fLastMask.texture()) {
+        if (NULL == back->fLastMask) {
             return -1;
         }
 
-        return back->fLastMask.texture()->width();
+        return back->fLastMask->width();
     }
 
     int getLastMaskHeight() const {
 
         if (fStack.empty()) {
             SkASSERT(false);
             return -1;
         }
 
         GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
 
-        if (NULL == back->fLastMask.texture()) {
+        if (NULL == back->fLastMask) {
             return -1;
         }
 
-        return back->fLastMask.texture()->height();
+        return back->fLastMask->height();
     }
 
     void getLastBound(SkIRect* bound) const {
 
         if (fStack.empty()) {
             SkASSERT(false);
             bound->setEmpty();
             return;
         }
 
@@ skipping 29 matching lines @@
 
         void acquireMask(GrContext* context,
                          int32_t clipGenID,
                          const GrTextureDesc& desc,
                          const SkIRect& bound) {
 
             fLastClipGenID = clipGenID;
 
             // HACK: set the last param to true to indicate that this request is at
             // flush time and therefore we require a scratch texture with no pending IO operations.
-            fLastMask.set(context, desc, GrContext::kApprox_ScratchTexMatch, /*flushing=*/true);
+            fLastMask.reset(context->refScratchTexture(desc, GrContext::kApprox_ScratchTexMatch,
+                                                       /*flushing=*/true));
 
             fLastBound = bound;
         }
 
         void reset () {
             fLastClipGenID = SkClipStack::kInvalidGenID;
 
             GrTextureDesc desc;
 
-            fLastMask.set(NULL, desc);
+            fLastMask.reset(NULL);
             fLastBound.setEmpty();
         }
 
         int32_t                 fLastClipGenID;
         // The mask's width & height values are used by GrClipMaskManager to correctly scale the
         // texture coords for the geometry drawn with this mask. TODO: This should be a cache key
         // and not a hard ref to a texture.
-        GrAutoScratchTexture    fLastMask;
+        SkAutoTUnref<GrTexture> fLastMask;
         // fLastBound stores the bounding box of the clip mask in clip-stack space. This rect is
         // used by GrClipMaskManager to position a rect and compute texture coords for the mask.
         SkIRect                 fLastBound;
     };
 
     GrContext*   fContext;
     SkDeque      fStack;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif // GrClipMaskCache_DEFINED