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

Unified Diff: content/child/web_discardable_memory_impl.cc

Issue 1013373002: base: Remove DiscardableMemory::CreateLockedMemory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix win build issue Created 5 years, 9 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
« no previous file with comments | « content/child/web_discardable_memory_impl.h ('k') | skia/ext/SkDiscardableMemory_chrome.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/web_discardable_memory_impl.cc
diff --git a/content/child/web_discardable_memory_impl.cc b/content/child/web_discardable_memory_impl.cc
index cd04b06cad527b17b21f7854ddff27940741924c..4af1e10745912d570bd01c54e6496f254b625c36 100644
--- a/content/child/web_discardable_memory_impl.cc
+++ b/content/child/web_discardable_memory_impl.cc
@@ -4,6 +4,9 @@
#include "content/child/web_discardable_memory_impl.h"
+#include "base/memory/discardable_memory.h"
+#include "base/memory/discardable_memory_allocator.h"
+
namespace content {
WebDiscardableMemoryImpl::~WebDiscardableMemoryImpl() {}
@@ -12,7 +15,8 @@ WebDiscardableMemoryImpl::~WebDiscardableMemoryImpl() {}
scoped_ptr<WebDiscardableMemoryImpl>
WebDiscardableMemoryImpl::CreateLockedMemory(size_t size) {
return make_scoped_ptr(new WebDiscardableMemoryImpl(
- base::DiscardableMemory::CreateLockedMemory(size)));
+ base::DiscardableMemoryAllocator::GetInstance()
+ ->AllocateLockedDiscardableMemory(size)));
}
bool WebDiscardableMemoryImpl::lock() {
« no previous file with comments | « content/child/web_discardable_memory_impl.h ('k') | skia/ext/SkDiscardableMemory_chrome.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698