summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/client/mapped_memory.h
diff options
context:
space:
mode:
authorearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-12 23:56:27 +0000
committerearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-12 23:56:27 +0000
commitd2232ea076c4f729a21d5508e85ac2665f04f052 (patch)
tree271a324e835a28797546db617aaa0c5098495872 /gpu/command_buffer/client/mapped_memory.h
parent5f3c0f1af9e4281e7763a369f70f0fad8cbaef23 (diff)
downloadchromium_src-d2232ea076c4f729a21d5508e85ac2665f04f052.zip
chromium_src-d2232ea076c4f729a21d5508e85ac2665f04f052.tar.gz
chromium_src-d2232ea076c4f729a21d5508e85ac2665f04f052.tar.bz2
Fix memory leak in MappedMemoryManager::FreeUnused().
Previously FreeUnused did not free anything, but instead leaked all memory allocated through this MappedMemoryManager. BUG=122437, 259357 R=apatrick@chromium.org Review URL: https://chromiumcodereview.appspot.com/18888006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/client/mapped_memory.h')
-rw-r--r--gpu/command_buffer/client/mapped_memory.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/gpu/command_buffer/client/mapped_memory.h b/gpu/command_buffer/client/mapped_memory.h
index 2dfef72..ec70c43 100644
--- a/gpu/command_buffer/client/mapped_memory.h
+++ b/gpu/command_buffer/client/mapped_memory.h
@@ -5,8 +5,7 @@
#ifndef GPU_COMMAND_BUFFER_CLIENT_MAPPED_MEMORY_H_
#define GPU_COMMAND_BUFFER_CLIENT_MAPPED_MEMORY_H_
-#include <vector>
-
+#include "base/memory/scoped_vector.h"
#include "gpu/command_buffer/client/fenced_allocator.h"
#include "gpu/command_buffer/common/buffer.h"
#include "gpu/command_buffer/common/types.h"
@@ -152,7 +151,7 @@ class GPU_EXPORT MappedMemoryManager {
}
private:
- typedef std::vector<MemoryChunk*> MemoryChunkVector;
+ typedef ScopedVector<MemoryChunk> MemoryChunkVector;
// size a chunk is rounded up to.
unsigned int chunk_size_multiple_;