Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index 9b85289a4eebde320e1ffa6cc5b209f0dda209ca..10bae57d0e0fd326857727805c2ee9cb212f66f9 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -411,6 +411,20 @@ void RenderThreadImpl::Init() { |
renderer_process_id_ = base::kNullProcessId; |
+ if (command_line.HasSwitch(switches::kUseDiscardableMemory)) { |
+ std::string requested_type_name = command_line.GetSwitchValueASCII( |
+ switches::kUseDiscardableMemory); |
+ if (requested_type_name == "none") { |
Philippe
2013/12/18 09:07:47
Nit: I would remove the braces for consistency wit
reveman
2013/12/18 19:44:25
I changed this a bit in latest patch by introducin
|
+ base::DiscardableMemory::SetType(base::DISCARDABLE_MEMORY_TYPE_NONE); |
+ } else if (requested_type_name == "android") { |
+ base::DiscardableMemory::SetType(base::DISCARDABLE_MEMORY_TYPE_ANDROID); |
+ } else if (requested_type_name == "mac") { |
+ base::DiscardableMemory::SetType(base::DISCARDABLE_MEMORY_TYPE_MAC); |
+ } else if (requested_type_name == "emulated") { |
+ base::DiscardableMemory::SetType(base::DISCARDABLE_MEMORY_TYPE_EMULATED); |
+ } |
+ } |
+ |
// AllocateGpuMemoryBuffer must be used exclusively on one thread but |
// it doesn't have to be the same thread RenderThreadImpl is created on. |
allocate_gpu_memory_buffer_thread_checker_.DetachFromThread(); |