Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: webkit/glue/web_discardable_memory_impl.cc

Issue 15650016: [Not for review] Discardable memory emulation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 6 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:
View side-by-side diff with in-line comments
Download patch
Index: webkit/glue/web_discardable_memory_impl.cc
diff --git a/webkit/glue/web_discardable_memory_impl.cc b/webkit/glue/web_discardable_memory_impl.cc
index d4c3ee280a86a68439761e10e6ae428a2dfd84d1..02f9458fbb51086587a2e4c57c75747e61b7cabf 100644
--- a/webkit/glue/web_discardable_memory_impl.cc
+++ b/webkit/glue/web_discardable_memory_impl.cc
@@ -6,17 +6,24 @@
namespace webkit_glue {
-WebDiscardableMemoryImpl::WebDiscardableMemoryImpl()
- : discardable_(new base::DiscardableMemory()) {
+WebDiscardableMemoryImpl::WebDiscardableMemoryImpl() {
+ if (base::DiscardableMemoryProvider* provider =
+ base::DiscardableMemoryProvider::GetInstance())
+ discardable_.reset(provider->CreateDiscardableMemory());
}
WebDiscardableMemoryImpl::~WebDiscardableMemoryImpl() {}
bool WebDiscardableMemoryImpl::InitializeAndLock(size_t size) {
+ if (!discardable_)
+ return false;
return discardable_->InitializeAndLock(size);
}
bool WebDiscardableMemoryImpl::lock() {
+ if (!discardable_)
+ return false;
+
base::LockDiscardableMemoryStatus status = discardable_->Lock();
switch (status) {
case base::DISCARDABLE_MEMORY_SUCCESS:
@@ -31,10 +38,14 @@ bool WebDiscardableMemoryImpl::lock() {
}
void* WebDiscardableMemoryImpl::data() {
+ if (!discardable_)
+ return NULL;
return discardable_->Memory();
}
void WebDiscardableMemoryImpl::unlock() {
+ if (!discardable_)
+ return;
discardable_->Unlock();
}

Powered by Google App Engine
This is Rietveld 408576698