summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorreveman <reveman@chromium.org>2015-02-26 17:23:30 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-27 01:24:01 +0000
commit4ac97e253331014990bf5c3f4ccfd5a751f2360b (patch)
treed54ad653542b5a1b6be70d3da8953619c5dffd44 /base
parentf88b95a2c9037e4329168f951130c49bb60f703a (diff)
downloadchromium_src-4ac97e253331014990bf5c3f4ccfd5a751f2360b.zip
chromium_src-4ac97e253331014990bf5c3f4ccfd5a751f2360b.tar.gz
chromium_src-4ac97e253331014990bf5c3f4ccfd5a751f2360b.tar.bz2
base: Use browser-wide discardable memory on Android.
BUG=460749 Review URL: https://codereview.chromium.org/827833002 Cr-Commit-Position: refs/heads/master@{#318370}
Diffstat (limited to 'base')
-rw-r--r--base/memory/discardable_memory_android.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/memory/discardable_memory_android.cc b/base/memory/discardable_memory_android.cc
index 5dcdfdc..2b35587 100644
--- a/base/memory/discardable_memory_android.cc
+++ b/base/memory/discardable_memory_android.cc
@@ -52,8 +52,8 @@ bool DiscardableMemory::ReduceMemoryUsage() {
void DiscardableMemory::GetSupportedTypes(
std::vector<DiscardableMemoryType>* types) {
const DiscardableMemoryType supported_types[] = {
- DISCARDABLE_MEMORY_TYPE_ASHMEM,
DISCARDABLE_MEMORY_TYPE_SHMEM,
+ DISCARDABLE_MEMORY_TYPE_ASHMEM,
DISCARDABLE_MEMORY_TYPE_EMULATED
};
types->assign(supported_types, supported_types + arraysize(supported_types));