commit 11f0b519766dabed4ce882f3ee7c07a68d3ccb52
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Mar 29 20:52:23 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Mar 29 20:52:23 2011 +0000
tree a24df14209f74dac930584f0cc22d8e72ae06517
parent cf3edc9c972ce1696d1fe21dcddbabbca2999361

Fix ref leak on GrGpu.

Review URL: http://codereview.appspot.com/4323043/



git-svn-id: http://skia.googlecode.com/svn/trunk@1015 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/src/GrBufferAllocPool.cpp

diff --git a/gpu/src/GrBufferAllocPool.cpp b/gpu/src/GrBufferAllocPool.cpp
index 35f0c5e..0db12fe 100644
--- a/gpu/src/GrBufferAllocPool.cpp
+++ b/gpu/src/GrBufferAllocPool.cpp
@@ -34,11 +34,14 @@
                                      size_t blockSize,
                                      int preallocBufferCnt) :
         fBlocks(GrMax(8, 2*preallocBufferCnt)) {
+
     GrAssert(NULL != gpu);
     fGpu = gpu;
+    fGpu->ref();
+    fGpuIsReffed = true;
+
     fBufferType = bufferType;
     fFrequentResetHint = frequentResetHint;
-    fGpu->ref();
     fBufferPtr = NULL;
     fMinBlockSize = GrMax(GrBufferAllocPool_MIN_BLOCK_SIZE, blockSize);
 
@@ -61,11 +64,18 @@
             buffer->unlock();
         }
     }
-    fPreallocBuffers.unrefAll();
     while (!fBlocks.empty()) {
         destroyBlock();
     }
-    fGpu->unref();
+    fPreallocBuffers.unrefAll();
+    releaseGpuRef();
+}
+
+void GrBufferAllocPool::releaseGpuRef() {
+    if (fGpuIsReffed) {
+        fGpu->unref();
+        fGpuIsReffed = false;
+    }
 }
 
 void GrBufferAllocPool::reset() {