Some cleanup in GrTextureProvider and GrResourceProvider

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 177 matching lines @@
             this->reset();
         }
 
         void acquireMask(GrResourceProvider* resourceProvider,
                          int32_t clipGenID,
                          const GrSurfaceDesc& 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.reset(resourceProvider->refScratchTexture(
-                desc, GrTextureProvider::kApprox_ScratchTexMatch, /*flushing=*/true));
+            // TODO: Determine if we really need the NoPendingIO flag anymore.
+            // (http://skbug.com/4156)
+            static const uint32_t kFlags = GrResourceProvider::kNoPendingIO_Flag;
+            fLastMask.reset(resourceProvider->createApproxTexture(desc, kFlags));
 
             fLastBound = bound;
         }
 
         void reset () {
             fLastClipGenID = SkClipStack::kInvalidGenID;
 
             GrSurfaceDesc desc;
 
             fLastMask.reset(NULL);
@@ skipping 10 matching lines @@
         SkIRect                 fLastBound;
     };
 
     SkDeque             fStack;
     GrResourceProvider* fResourceProvider;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif // GrClipMaskCache_DEFINED