Refactor GrBufferAllocPools to use resource cache

src/gpu/SkGpuDevice.cpp

Index: src/gpu/SkGpuDevice.cpp
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 7a50e0409cf016e0cfe3b360c0ab4076430830fb..3cc23291d4328b8568aeeea4609f43f6b971aea1 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -689,7 +689,7 @@ bool draw_with_mask_filter(GrContext* context,
     desc.fConfig = kAlpha_8_GrPixelConfig;
 
     SkAutoTUnref<GrTexture> texture(context->textureProvider()->refScratchTexture(
-        desc, GrTextureProvider::kApprox_ScratchTexMatch));
+        desc, GrTextureProvider::kApprox_ScratchMatch));
     if (!texture) {
         return false;
     }
@@ -724,7 +724,7 @@ GrTexture* create_mask_GPU(GrContext* context,
     }
 
     GrTexture* mask = context->textureProvider()->refScratchTexture(
-        desc, GrTextureProvider::kApprox_ScratchTexMatch);
+        desc, GrTextureProvider::kApprox_ScratchMatch);
     if (NULL == mask) {
         return NULL;
     }
@@ -1967,9 +1967,9 @@ SkBaseDevice* SkGpuDevice::onCreateDevice(const CreateInfo& cinfo, const SkPaint
 
     // layers are never draw in repeat modes, so we can request an approx
     // match and ignore any padding.
-    const GrTextureProvider::ScratchTexMatch match = (kNever_TileUsage == cinfo.fTileUsage) ?
-                                                  GrTextureProvider::kApprox_ScratchTexMatch :
-                                                  GrTextureProvider::kExact_ScratchTexMatch;
+    const GrTextureProvider::ScratchMatch match = (kNever_TileUsage == cinfo.fTileUsage) ?
+                                                  GrTextureProvider::kApprox_ScratchMatch :
+                                                  GrTextureProvider::kExact_ScratchMatch;
     texture.reset(fContext->textureProvider()->refScratchTexture(desc, match));
 
     if (texture) {