Some cleanup in GrTextureProvider and GrResourceProvider

src/gpu/GrVertexBuffer.h

Index: src/gpu/GrVertexBuffer.h
diff --git a/src/gpu/GrVertexBuffer.h b/src/gpu/GrVertexBuffer.h
index 3c12cd76d2a6b496ec9e40410ded571534571207..3c62cd61ca7f3c7e7dff63149cecb97d52dd890d 100644
--- a/src/gpu/GrVertexBuffer.h
+++ b/src/gpu/GrVertexBuffer.h
@@ -27,9 +27,12 @@ public:
 protected:
     GrVertexBuffer(GrGpu* gpu, size_t gpuMemorySize, bool dynamic, bool cpuBacked)
         : INHERITED(gpu, gpuMemorySize, dynamic, cpuBacked) {
-        GrScratchKey key;
-        ComputeScratchKey(gpuMemorySize, dynamic, &key);
-        this->setScratchKey(key);
+        // We currently only make buffers scratch if they're both pow2 sized and not cpuBacked.
+        if (!cpuBacked && SkIsPow2(gpuMemorySize)) {
+            GrScratchKey key;
+            ComputeScratchKey(gpuMemorySize, dynamic, &key);
+            this->setScratchKey(key);
+        }
     }
 
 private: