Refactor GrBufferAllocPools to use resource cache

src/gpu/GrContext.cpp

Index: src/gpu/GrContext.cpp
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index e26c57f9f6553d651c4aa532361d6dc4ae02332d..6f5cb07c329d0f503fa49bfeb64021c8821656ab 100755
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1428,7 +1428,7 @@ bool GrContext::writeSurfacePixels(GrSurface* surface,
     desc.fHeight = height;
     desc.fConfig = writeConfig;
     SkAutoTUnref<GrTexture> texture(this->textureProvider()->refScratchTexture(desc,
-        GrTextureProvider::kApprox_ScratchTexMatch));
+        GrTextureProvider::kApprox_ScratchMatch));
     if (!texture) {
         return false;
     }
@@ -1573,13 +1573,13 @@ bool GrContext::readRenderTargetPixels(GrRenderTarget* target,
         // match the passed rect. However, if we see many different size rectangles we will trash
         // our texture cache and pay the cost of creating and destroying many textures. So, we only
         // request an exact match when the caller is reading an entire RT.
-        GrTextureProvider::ScratchTexMatch match = GrTextureProvider::kApprox_ScratchTexMatch;
+        GrTextureProvider::ScratchMatch match = GrTextureProvider::kApprox_ScratchMatch;
         if (0 == left &&
             0 == top &&
             target->width() == width &&
             target->height() == height &&
             fGpu->fullReadPixelsIsFasterThanPartial()) {
-            match = GrTextureProvider::kExact_ScratchTexMatch;
+            match = GrTextureProvider::kExact_ScratchMatch;
         }
         tempTexture.reset(this->textureProvider()->refScratchTexture(desc, match));
         if (tempTexture) {