Enforce a memory limit on MappedMemoryManager

gpu/command_buffer/client/gles2_implementation.cc

Index: gpu/command_buffer/client/gles2_implementation.cc
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index 9285b6d82ef1721de747ec98f02f3bc47acedf21..59ab0cd495ce1223365577914292af17248787e0 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -17,7 +17,6 @@
 #include <GLES2/gl2extchromium.h>
 #include "gpu/command_buffer/client/buffer_tracker.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_tracker.h"
-#include "gpu/command_buffer/client/mapped_memory.h"
 #include "gpu/command_buffer/client/program_info_manager.h"
 #include "gpu/command_buffer/client/query_tracker.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
@@ -134,6 +133,18 @@ bool GLES2Implementation::Initialize(
     unsigned int starting_transfer_buffer_size,
     unsigned int min_transfer_buffer_size,
     unsigned int max_transfer_buffer_size) {
+  return InitializeWithMemoryLimit(
+      starting_transfer_buffer_size,
+      min_transfer_buffer_size,
+      min_transfer_buffer_size,
+      MappedMemoryManager::kNoLimit);
+}
+
+bool GLES2Implementation::InitializeWithMemoryLimit(
+    unsigned int starting_transfer_buffer_size,
+    unsigned int min_transfer_buffer_size,
+    unsigned int max_transfer_buffer_size,
+    unsigned int mapped_memory_limit) {

[no sievers, 2013/08/19 21:57:44]

you can just add it to Initialize, it already has the other limits

[kaanb, 2013/08/20 01:23:43]

Done.

   GPU_DCHECK_GE(starting_transfer_buffer_size, min_transfer_buffer_size);
   GPU_DCHECK_LE(starting_transfer_buffer_size, max_transfer_buffer_size);
   GPU_DCHECK_GE(min_transfer_buffer_size, kStartingOffset);
@@ -148,8 +159,7 @@ bool GLES2Implementation::Initialize(
     return false;
   }
 
-  mapped_memory_.reset(new MappedMemoryManager(helper_));
-  SetSharedMemoryChunkSizeMultiple(1024 * 1024 * 2);

[no sievers, 2013/08/19 21:57:44]

Why are you removing this?

[kaanb, 2013/08/20 01:23:43]

Done.

+  mapped_memory_.reset(new MappedMemoryManager(helper_, mapped_memory_limit));
 
   if (!QueryAndCacheStaticState())
     return false;
@@ -289,11 +299,6 @@ uint32 GLES2Implementation::GetResultShmOffset() {
   return transfer_buffer_->GetResultOffset();
 }
 
-void GLES2Implementation::SetSharedMemoryChunkSizeMultiple(
-    unsigned int multiple) {
-  mapped_memory_->set_chunk_size_multiple(multiple);
-}
-
 void GLES2Implementation::FreeUnusedSharedMemory() {
   mapped_memory_->FreeUnused();
 }