Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/memory/discardable_memory.h" | 5 #include "base/memory/discardable_memory.h" |
| 6 | 6 |
| 7 #include "base/memory/discardable_memory_shmem.h" | 7 #include "base/memory/discardable_memory_allocator.h" |
| 8 | 8 |
| 9 namespace base { | 9 namespace base { |
| 10 | 10 |
| 11 // static | 11 // static |
| 12 scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemory( | 12 scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemory( |
|
Nico
2015/03/16 21:55:30
should this go too?
reveman
2015/03/16 22:37:26
Yes, I considered that but decided to leave for a
| |
| 13 size_t size) { | 13 size_t size) { |
| 14 return make_scoped_ptr(new internal::DiscardableMemoryShmem(size)); | 14 return DiscardableMemoryAllocator::GetInstance() |
| 15 ->AllocateLockedDiscardableMemory(size); | |
| 15 } | 16 } |
| 16 | 17 |
| 17 } // namespace base | 18 } // namespace base |
| OLD | NEW |