commit de6ac2dec54a34545dae1986cd743d24c8d655e8
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Feb 25 21:50:42 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Feb 25 21:50:42 2011 +0000
tree 1c372d067e82172bc3429258886b7fcf8c3e34c9
parent f4888c4b45b5be3d0614b52ec764b16ea6b4c46d

Fix double delete of vb pool and missing delete of ib pool



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

gpu/src/GrContext.cpp

diff --git a/gpu/src/GrContext.cpp b/gpu/src/GrContext.cpp
index d14f374..840e773 100644
--- a/gpu/src/GrContext.cpp
+++ b/gpu/src/GrContext.cpp
@@ -62,7 +62,7 @@
     delete fFontCache;
     delete fDrawBuffer;
     delete fDrawBufferVBAllocPool;
-    delete fDrawBufferVBAllocPool;
+    delete fDrawBufferIBAllocPool;
     delete fPathRenderer;
 }
 
@@ -383,7 +383,7 @@
             GrVertexLayout layout = (textured) ?
                             GrDrawTarget::StagePosAsTexCoordVertexLayoutBit(0) :
                             0;
-            target->setVertexSourceToBuffer(layout, 
+            target->setVertexSourceToBuffer(layout,
                                             fGpu->getUnitSquareVertexBuffer());
             GrDrawTarget::AutoViewMatrixRestore avmr(target);
             GrMatrix m;
@@ -417,7 +417,7 @@
         drawRect(paint, dstRect, -1, dstMatrix);
         return;
     }
-    
+
     GR_STATIC_ASSERT(!BATCH_RECT_TO_RECT || !GR_STATIC_RECT_VB);
 
 #if GR_STATIC_RECT_VB
@@ -449,9 +449,9 @@
 #else
 
     GrDrawTarget* target;
-#if BATCH_RECT_TO_RECT 
+#if BATCH_RECT_TO_RECT
     target = this->prepareToDraw(paint, kBuffered_DrawCategory);
-#else 
+#else
     target = this->prepareToDraw(paint, kUnbuffered_DrawCategory);
 #endif
 
@@ -640,7 +640,7 @@
     target->setBlendFunc(paint.fSrcBlendCoeff, paint.fDstBlendCoeff);
 }
 
-GrDrawTarget* GrContext::prepareToDraw(const GrPaint& paint, 
+GrDrawTarget* GrContext::prepareToDraw(const GrPaint& paint,
                                        DrawCategory category) {
     if (category != fLastDrawCategory) {
         flushDrawBuffer();
@@ -731,13 +731,13 @@
     fLastDrawCategory = kUnbuffered_DrawCategory;
 
 #if DEFER_TEXT_RENDERING || BATCH_RECT_TO_RECT
-    fDrawBufferVBAllocPool = 
+    fDrawBufferVBAllocPool =
         new GrVertexBufferAllocPool(gpu, false,
                                     DRAW_BUFFER_VBPOOL_BUFFER_SIZE,
                                     DRAW_BUFFER_VBPOOL_PREALLOC_BUFFERS);
-    fDrawBufferIBAllocPool = 
+    fDrawBufferIBAllocPool =
         new GrIndexBufferAllocPool(gpu, false,
-                                   DRAW_BUFFER_IBPOOL_BUFFER_SIZE, 
+                                   DRAW_BUFFER_IBPOOL_BUFFER_SIZE,
                                    DRAW_BUFFER_IBPOOL_PREALLOC_BUFFERS);
 
     fDrawBuffer = new GrInOrderDrawBuffer(fDrawBufferVBAllocPool,