diff options
| author | reveman <reveman@chromium.org> | 2015-01-17 13:13:52 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-17 21:14:33 +0000 |
| commit | 07e0fd329293cca145875e156b87afdf383dcdc0 (patch) | |
| tree | 17c284722d245ad6dc57fddfa436717dc264e9a9 | |
| parent | c927be4771b4c59c1bd35de68d2cf0e8e67bcf4b (diff) | |
| download | chromium_src-07e0fd329293cca145875e156b87afdf383dcdc0.zip chromium_src-07e0fd329293cca145875e156b87afdf383dcdc0.tar.gz chromium_src-07e0fd329293cca145875e156b87afdf383dcdc0.tar.bz2 | |
Re-land: base: Enable browser-wide discardable memory on Linux, CrOS and Windows.
This makes SHMEM implementation of discardable memory preferred
over EMULATED implementation. This effectively makes SHMEM the
implementation used by default on Linux, CrOS and Windows.
SHMEM implementation of discardable memory gives the browser
process control over the total amount of discardable memory used
and allows us to enforce a global limit of 512MB across all
renderers.
BUG=429415,429416
Review URL: https://codereview.chromium.org/793443003
Cr-Commit-Position: refs/heads/master@{#312045}
| -rw-r--r-- | base/memory/discardable_memory_android.cc | 4 | ||||
| -rw-r--r-- | base/memory/discardable_memory_linux.cc | 4 | ||||
| -rw-r--r-- | base/memory/discardable_memory_mac.cc | 4 | ||||
| -rw-r--r-- | base/memory/discardable_memory_win.cc | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/base/memory/discardable_memory_android.cc b/base/memory/discardable_memory_android.cc index de71124..04e2780 100644 --- a/base/memory/discardable_memory_android.cc +++ b/base/memory/discardable_memory_android.cc @@ -58,8 +58,8 @@ void DiscardableMemory::GetSupportedTypes( std::vector<DiscardableMemoryType>* types) { const DiscardableMemoryType supported_types[] = { DISCARDABLE_MEMORY_TYPE_ASHMEM, - DISCARDABLE_MEMORY_TYPE_EMULATED, - DISCARDABLE_MEMORY_TYPE_SHMEM + DISCARDABLE_MEMORY_TYPE_SHMEM, + DISCARDABLE_MEMORY_TYPE_EMULATED }; types->assign(supported_types, supported_types + arraysize(supported_types)); } diff --git a/base/memory/discardable_memory_linux.cc b/base/memory/discardable_memory_linux.cc index 9b4e940..863c6db 100644 --- a/base/memory/discardable_memory_linux.cc +++ b/base/memory/discardable_memory_linux.cc @@ -24,8 +24,8 @@ bool DiscardableMemory::ReduceMemoryUsage() { void DiscardableMemory::GetSupportedTypes( std::vector<DiscardableMemoryType>* types) { const DiscardableMemoryType supported_types[] = { - DISCARDABLE_MEMORY_TYPE_EMULATED, - DISCARDABLE_MEMORY_TYPE_SHMEM + DISCARDABLE_MEMORY_TYPE_SHMEM, + DISCARDABLE_MEMORY_TYPE_EMULATED }; types->assign(supported_types, supported_types + arraysize(supported_types)); } diff --git a/base/memory/discardable_memory_mac.cc b/base/memory/discardable_memory_mac.cc index 18cf80a..b123f23 100644 --- a/base/memory/discardable_memory_mac.cc +++ b/base/memory/discardable_memory_mac.cc @@ -28,8 +28,8 @@ void DiscardableMemory::GetSupportedTypes( std::vector<DiscardableMemoryType>* types) { const DiscardableMemoryType supported_types[] = { DISCARDABLE_MEMORY_TYPE_MACH, - DISCARDABLE_MEMORY_TYPE_EMULATED, - DISCARDABLE_MEMORY_TYPE_SHMEM + DISCARDABLE_MEMORY_TYPE_SHMEM, + DISCARDABLE_MEMORY_TYPE_EMULATED }; types->assign(supported_types, supported_types + arraysize(supported_types)); } diff --git a/base/memory/discardable_memory_win.cc b/base/memory/discardable_memory_win.cc index 9b4e940..863c6db 100644 --- a/base/memory/discardable_memory_win.cc +++ b/base/memory/discardable_memory_win.cc @@ -24,8 +24,8 @@ bool DiscardableMemory::ReduceMemoryUsage() { void DiscardableMemory::GetSupportedTypes( std::vector<DiscardableMemoryType>* types) { const DiscardableMemoryType supported_types[] = { - DISCARDABLE_MEMORY_TYPE_EMULATED, - DISCARDABLE_MEMORY_TYPE_SHMEM + DISCARDABLE_MEMORY_TYPE_SHMEM, + DISCARDABLE_MEMORY_TYPE_EMULATED }; types->assign(supported_types, supported_types + arraysize(supported_types)); } |