| Index: webkit/child/web_discardable_memory_impl.cc
|
| diff --git a/webkit/child/web_discardable_memory_impl.cc b/webkit/child/web_discardable_memory_impl.cc
|
| index 285f1b0de9a47dce20dedad2610ee2dca244ae96..2bbf50c0b8816d35304ce98df59b4fdd2065d389 100644
|
| --- a/webkit/child/web_discardable_memory_impl.cc
|
| +++ b/webkit/child/web_discardable_memory_impl.cc
|
| @@ -12,18 +12,19 @@ WebDiscardableMemoryImpl::~WebDiscardableMemoryImpl() {}
|
| scoped_ptr<WebDiscardableMemoryImpl>
|
| WebDiscardableMemoryImpl::CreateLockedMemory(size_t size) {
|
| scoped_ptr<base::DiscardableMemory> memory(
|
| - base::DiscardableMemory::CreateLockedMemory(size));
|
| + base::DiscardableMemory::CreateLockedMemory(
|
| + base::DiscardableMemory::GetDefaultType(), size));
|
| if (!memory)
|
| return scoped_ptr<WebDiscardableMemoryImpl>();
|
| return make_scoped_ptr(new WebDiscardableMemoryImpl(memory.Pass()));
|
| }
|
|
|
| bool WebDiscardableMemoryImpl::lock() {
|
| - base::LockDiscardableMemoryStatus status = discardable_->Lock();
|
| + base::DiscardableMemoryLockStatus status = discardable_->Lock();
|
| switch (status) {
|
| - case base::DISCARDABLE_MEMORY_SUCCESS:
|
| + case base::DISCARDABLE_MEMORY_LOCK_STATUS_SUCCESS:
|
| return true;
|
| - case base::DISCARDABLE_MEMORY_PURGED:
|
| + case base::DISCARDABLE_MEMORY_LOCK_STATUS_PURGED:
|
| discardable_->Unlock();
|
| return false;
|
| default:
|
|
|