base/memory/discardable_memory_android.cc - Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/memory/discardable_memory_android.cc

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Android build fix Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: base/memory/discardable_memory_android.cc

diff --git a/base/memory/discardable_memory_android.cc b/base/memory/discardable_memory_android.cc

index 5dcdfdc9f9f90fc8e5c789e53fb7fbd7982da703..2b3558736c44d9371e021d171cfa913402cd1fcc 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));