Refactor to separate backend object lifecycle and GpuResource budget decision

include/gpu/GrBuffer.h

Index: include/gpu/GrBuffer.h
diff --git a/include/gpu/GrBuffer.h b/include/gpu/GrBuffer.h
index 7e04577543f2922a816c7199081d740c676297a4..829596e73456f82cc6cc5ba66f08f3fe7f92afda 100644
--- a/include/gpu/GrBuffer.h
+++ b/include/gpu/GrBuffer.h
@@ -110,22 +110,24 @@ public:
 protected:
     GrBuffer(GrGpu* gpu, size_t gpuMemorySize, GrBufferType intendedType,
              GrAccessPattern accessPattern, bool cpuBacked)
-        : INHERITED(gpu, kCached_LifeCycle),
+        : INHERITED(gpu),
           fMapPtr(nullptr),
           fGpuMemorySize(gpuMemorySize), // TODO: Zero for cpu backed buffers?
           fAccessPattern(accessPattern),
-          fCPUBacked(cpuBacked) {
+          fCPUBacked(cpuBacked),
+          fIntendedType(intendedType) {
+    }
+
+    void computeScratchKey(GrScratchKey* key) const override {
         if (!fCPUBacked && SkIsPow2(fGpuMemorySize) && kDynamic_GrAccessPattern == fAccessPattern) {
-            GrScratchKey key;
-            ComputeScratchKeyForDynamicBuffer(fGpuMemorySize, intendedType, &key);
-            this->setScratchKey(key);
+            ComputeScratchKeyForDynamicBuffer(fGpuMemorySize, fIntendedType, key);
         }
     }
 
     void* fMapPtr;
 
 private:
-    virtual size_t onGpuMemorySize() const { return fGpuMemorySize; }
+    size_t onGpuMemorySize() const override { return fGpuMemorySize; }
 
     virtual void onMap() = 0;
     virtual void onUnmap() = 0;
@@ -134,7 +136,7 @@ private:
     size_t            fGpuMemorySize;
     GrAccessPattern   fAccessPattern;
     bool              fCPUBacked;
-
+    GrBufferType      fIntendedType;
     typedef GrGpuResource INHERITED;
 };