| Index: base/memory/discardable_memory_emulated.cc
|
| diff --git a/base/memory/discardable_memory_emulated.cc b/base/memory/discardable_memory_emulated.cc
|
| index 928a2dfdc7e0c294bb861e1157522ef5a2a0b468..d743ab3df5631cfe5e68b10db797b37c58dd3e5f 100644
|
| --- a/base/memory/discardable_memory_emulated.cc
|
| +++ b/base/memory/discardable_memory_emulated.cc
|
| @@ -10,18 +10,19 @@
|
| namespace base {
|
| namespace {
|
|
|
| -// This is admittedly pretty magical. It's approximately enough memory for four
|
| -// 2560x1600 images.
|
| -const size_t kEmulatedMemoryLimit = 64 * 1024 * 1024;
|
| -const size_t kEmulatedBytesToKeepUnderModeratePressure =
|
| - kEmulatedMemoryLimit / 4;
|
| +// This is admittedly pretty magical.
|
| +const size_t kEmulatedMemoryLimit = 512 * 1024 * 1024;
|
| +const size_t kEmulatedSoftMemoryLimit = 32 * 1024 * 1024;
|
| +const size_t kEmulatedBytesToKeepUnderModeratePressure = 4 * 1024 * 1024;
|
| +const size_t kEmulatedHardMemoryLimitExpirationTimeMs = 1000;
|
|
|
| struct SharedState {
|
| SharedState()
|
| : manager(kEmulatedMemoryLimit,
|
| - kEmulatedMemoryLimit,
|
| + kEmulatedSoftMemoryLimit,
|
| kEmulatedBytesToKeepUnderModeratePressure,
|
| - TimeDelta::Max()) {}
|
| + TimeDelta::FromMilliseconds(
|
| + kEmulatedHardMemoryLimitExpirationTimeMs)) {}
|
|
|
| internal::DiscardableMemoryManager manager;
|
| };
|
|
|