Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Side by Side Diff: base/memory/discardable_memory_mac.cc

Issue 681713002: Update from chromium https://crrev.com/301315 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/memory/discardable_memory_linux.cc ('k') | base/memory/discardable_memory_mach.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/discardable_memory_emulated.h" 8 #include "base/memory/discardable_memory_emulated.h"
9 #include "base/memory/discardable_memory_mach.h" 9 #include "base/memory/discardable_memory_mach.h"
10 #include "base/memory/discardable_memory_manager.h" 10 #include "base/memory/discardable_memory_manager.h"
11 #include "base/memory/discardable_memory_shmem.h"
11 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
12 13
13 namespace base { 14 namespace base {
14 15
15 // static 16 // static
17 void DiscardableMemory::ReleaseFreeMemory() {
18 internal::DiscardableMemoryShmem::ReleaseFreeMemory();
19 }
20
21 // static
16 bool DiscardableMemory::ReduceMemoryUsage() { 22 bool DiscardableMemory::ReduceMemoryUsage() {
17 return internal::DiscardableMemoryEmulated::ReduceMemoryUsage(); 23 return internal::DiscardableMemoryEmulated::ReduceMemoryUsage();
18 } 24 }
19 25
20 // static 26 // static
21 void DiscardableMemory::GetSupportedTypes( 27 void DiscardableMemory::GetSupportedTypes(
22 std::vector<DiscardableMemoryType>* types) { 28 std::vector<DiscardableMemoryType>* types) {
23 const DiscardableMemoryType supported_types[] = { 29 const DiscardableMemoryType supported_types[] = {
24 DISCARDABLE_MEMORY_TYPE_MACH, 30 DISCARDABLE_MEMORY_TYPE_MACH,
25 DISCARDABLE_MEMORY_TYPE_EMULATED 31 DISCARDABLE_MEMORY_TYPE_EMULATED,
32 DISCARDABLE_MEMORY_TYPE_SHMEM
26 }; 33 };
27 types->assign(supported_types, supported_types + arraysize(supported_types)); 34 types->assign(supported_types, supported_types + arraysize(supported_types));
28 } 35 }
29 36
30 // static 37 // static
31 scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType( 38 scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType(
32 DiscardableMemoryType type, size_t size) { 39 DiscardableMemoryType type, size_t size) {
33 switch (type) { 40 switch (type) {
34 case DISCARDABLE_MEMORY_TYPE_MACH: { 41 case DISCARDABLE_MEMORY_TYPE_MACH: {
35 scoped_ptr<internal::DiscardableMemoryMach> memory( 42 scoped_ptr<internal::DiscardableMemoryMach> memory(
36 new internal::DiscardableMemoryMach(size)); 43 new internal::DiscardableMemoryMach(size));
37 if (!memory->Initialize()) 44 if (!memory->Initialize())
38 return nullptr; 45 return nullptr;
39 46
40 return memory.Pass(); 47 return memory.Pass();
41 } 48 }
42 case DISCARDABLE_MEMORY_TYPE_EMULATED: { 49 case DISCARDABLE_MEMORY_TYPE_EMULATED: {
43 scoped_ptr<internal::DiscardableMemoryEmulated> memory( 50 scoped_ptr<internal::DiscardableMemoryEmulated> memory(
44 new internal::DiscardableMemoryEmulated(size)); 51 new internal::DiscardableMemoryEmulated(size));
45 if (!memory->Initialize()) 52 if (!memory->Initialize())
46 return nullptr; 53 return nullptr;
47 54
48 return memory.Pass(); 55 return memory.Pass();
49 } 56 }
57 case DISCARDABLE_MEMORY_TYPE_SHMEM: {
58 scoped_ptr<internal::DiscardableMemoryShmem> memory(
59 new internal::DiscardableMemoryShmem(size));
60 if (!memory->Initialize())
61 return nullptr;
62
63 return memory.Pass();
64 }
50 case DISCARDABLE_MEMORY_TYPE_NONE: 65 case DISCARDABLE_MEMORY_TYPE_NONE:
51 case DISCARDABLE_MEMORY_TYPE_ASHMEM: 66 case DISCARDABLE_MEMORY_TYPE_ASHMEM:
52 NOTREACHED(); 67 NOTREACHED();
53 return nullptr; 68 return nullptr;
54 } 69 }
55 70
56 NOTREACHED(); 71 NOTREACHED();
57 return nullptr; 72 return nullptr;
58 } 73 }
59 74
60 // static 75 // static
61 void DiscardableMemory::PurgeForTesting() { 76 void DiscardableMemory::PurgeForTesting() {
62 internal::DiscardableMemoryMach::PurgeForTesting(); 77 internal::DiscardableMemoryMach::PurgeForTesting();
63 internal::DiscardableMemoryEmulated::PurgeForTesting(); 78 internal::DiscardableMemoryEmulated::PurgeForTesting();
79 internal::DiscardableMemoryShmem::PurgeForTesting();
64 } 80 }
65 81
66 } // namespace base 82 } // namespace base
OLDNEW
« no previous file with comments | « base/memory/discardable_memory_linux.cc ('k') | base/memory/discardable_memory_mach.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698