base/memory/discardable_memory.cc - Issue 681713002: Update from chromium https://crrev.com/301315

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.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, 2 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.cc

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

index 3ecc5f73c91762bee9a29d217c700592f0a84eea..3d82f91d78ffe964a8332f7f05b8d957ef59d717 100644

--- a/base/memory/discardable_memory.cc

+++ b/base/memory/discardable_memory.cc

@@ -16,7 +16,8 @@ const struct TypeNamePair {

} kTypeNamePairs[] = {

{ DISCARDABLE_MEMORY_TYPE_ASHMEM, "ashmem" },

{ DISCARDABLE_MEMORY_TYPE_MACH, "mach" },

- { DISCARDABLE_MEMORY_TYPE_EMULATED, "emulated" }

+ { DISCARDABLE_MEMORY_TYPE_EMULATED, "emulated" },

+ { DISCARDABLE_MEMORY_TYPE_SHMEM, "shmem" }

};

DiscardableMemoryType g_preferred_type = DISCARDABLE_MEMORY_TYPE_NONE;

« no previous file with comments | « base/memory/discardable_memory.h ('k') | base/memory/discardable_memory_android.cc » ('j') | no next file with comments »