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..3987a2e83f659bcbefbfb4bdda046c1b8f3c6940 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -24,6 +24,11 @@
 #include "gpu/command_buffer/client/vertex_array_object_manager.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/common/trace_event.h"
+
+#if defined(OS_ANDROID)
+#include "ui/gfx/android/device_display_info.h"
+#endif
+
 #include "ui/gfx/gpu_memory_buffer.h"
 
 #if defined(__native_client__) && !defined(GLES2_SUPPORT_CLIENT_SIDE_ARRAYS)
@@ -148,8 +153,20 @@ bool GLES2Implementation::Initialize(
     return false;
   }
 
+#if defined(OS_ANDROID)

[no sievers, 2013/08/15 01:07:15]

there is an ifdef android in a different place now.

can''t this limit be in the same places where we deal with the other limits?

[kaanb, 2013/08/15 01:21:05]

If we need to base this on the screen size of the device we need an ifdef.

Another possibility is to maybe create constants in mapped_memory.h, I don't
really want to put them in WGC3D headers as it breaks encapsulation.

[piman, 2013/08/15 02:49:03]

Agreed with Daniel, please inject this value instead of hard-coding it inside of
GLES2Implementation.
What if you want a different value between renderer and browser? Or even between
different contexts in the same process? Does DeviceDisplayInfo even work in the
renderer?
What if other platforms want to tweak this value?
Etc.

This breaks encapsulation way worse than injecting it.

[kaanb, 2013/08/16 22:50:44]

Done.

+  static const size_t kBytesPerPixel = 4;
+  gfx::DeviceDisplayInfo display_info;
+  size_t full_screen_texture_size_in_bytes =
+      display_info.GetDisplayHeight() *
+      display_info.GetDisplayWidth() *
+      kBytesPerPixel;
+  mapped_memory_.reset(
+      new MappedMemoryManager(helper_,
+                              2 * full_screen_texture_size_in_bytes));
+#else
   mapped_memory_.reset(new MappedMemoryManager(helper_));
-  SetSharedMemoryChunkSizeMultiple(1024 * 1024 * 2);
+#endif
+  mapped_memory_->set_chunk_size_multiple(2 * 1024 * 1024);
 
   if (!QueryAndCacheStaticState())
     return false;
@@ -289,11 +306,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();
 }