projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
base
/
memory
/
discardable_memory.h
diff --git
a/src/base/memory/discardable_memory.h
b/src/base/memory/discardable_memory.h
index
c39d0db
..
53d8d0e
100644
(file)
--- a/
src/base/memory/discardable_memory.h
+++ b/
src/base/memory/discardable_memory.h
@@
-19,7
+19,8
@@
enum DiscardableMemoryType {
DISCARDABLE_MEMORY_TYPE_NONE,
DISCARDABLE_MEMORY_TYPE_ANDROID,
DISCARDABLE_MEMORY_TYPE_MAC,
DISCARDABLE_MEMORY_TYPE_NONE,
DISCARDABLE_MEMORY_TYPE_ANDROID,
DISCARDABLE_MEMORY_TYPE_MAC,
- DISCARDABLE_MEMORY_TYPE_EMULATED
+ DISCARDABLE_MEMORY_TYPE_EMULATED,
+ DISCARDABLE_MEMORY_TYPE_MALLOC
};
enum DiscardableMemoryLockStatus {
};
enum DiscardableMemoryLockStatus {