| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 56a15b0aa4251f597a948644485fcb271996e77f..8a0452a8fd7cb21653535dc7e41ddd76829f9a81 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -406,6 +406,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") {
|
| + base::DiscardableMemory::SetType(DISCARDABLE_MEMORY_NONE);
|
| + } else if (requested_type_name == "android") {
|
| + base::DiscardableMemory::SetType(DISCARDABLE_MEMORY_ANDROID);
|
| + } else if (requested_type_name == "mac") {
|
| + base::DiscardableMemory::SetType(DISCARDABLE_MEMORY_MAC);
|
| + } else if (requested_type_name == "emulated") {
|
| + base::DiscardableMemory::SetType(DISCARDABLE_MEMORY_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();
|
|
|