Some cleanup in GrTextureProvider and GrResourceProvider

src/gpu/GrClipMaskCache.h

Index: src/gpu/GrClipMaskCache.h
diff --git a/src/gpu/GrClipMaskCache.h b/src/gpu/GrClipMaskCache.h
index 4b702c0d418a424f8d40092e2318744295da5dd5..edba54d372368951bfe1b2d8e32b7ba1d4eb3734 100644
--- a/src/gpu/GrClipMaskCache.h
+++ b/src/gpu/GrClipMaskCache.h
@@ -195,10 +195,10 @@ private:
 
             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;
         }