Index: content/browser/renderer_host/render_message_filter.cc |
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc |
index 95d3193c5bea6cb7bbfa5a1b2299f176d6788f88..9b9225b2e2e5019a5e9b8c49c71a203a396cc400 100644 |
--- a/content/browser/renderer_host/render_message_filter.cc |
+++ b/content/browser/renderer_host/render_message_filter.cc |
@@ -162,7 +162,7 @@ RenderMessageFilter::~RenderMessageFilter() { |
BrowserGpuMemoryBufferManager::current(); |
if (gpu_memory_buffer_manager) |
gpu_memory_buffer_manager->ProcessRemoved(PeerHandle(), render_process_id_); |
- HostDiscardableSharedMemoryManager::current()->ProcessRemoved( |
+ discardable_memory::DiscardableSharedMemoryManager::current()->ClientRemoved( |
render_process_id_); |
} |
@@ -390,11 +390,11 @@ void RenderMessageFilter::OnDeletedSharedBitmap(const cc::SharedBitmapId& id) { |
void RenderMessageFilter::AllocateLockedDiscardableSharedMemoryOnFileThread( |
uint32_t size, |
- DiscardableSharedMemoryId id, |
+ discardable_memory::DiscardableSharedMemoryId id, |
IPC::Message* reply_msg) { |
base::SharedMemoryHandle handle; |
- HostDiscardableSharedMemoryManager::current() |
- ->AllocateLockedDiscardableSharedMemoryForChild( |
+ discardable_memory::DiscardableSharedMemoryManager::current() |
+ ->AllocateLockedDiscardableSharedMemoryForClient( |
PeerHandle(), render_process_id_, size, id, &handle); |
ChildProcessHostMsg_SyncAllocateLockedDiscardableSharedMemory:: |
WriteReplyParams(reply_msg, handle); |
@@ -403,7 +403,7 @@ void RenderMessageFilter::AllocateLockedDiscardableSharedMemoryOnFileThread( |
void RenderMessageFilter::OnAllocateLockedDiscardableSharedMemory( |
uint32_t size, |
- DiscardableSharedMemoryId id, |
+ discardable_memory::DiscardableSharedMemoryId id, |
IPC::Message* reply_msg) { |
BrowserThread::PostTask( |
BrowserThread::FILE_USER_BLOCKING, FROM_HERE, |
@@ -413,13 +413,13 @@ void RenderMessageFilter::OnAllocateLockedDiscardableSharedMemory( |
} |
void RenderMessageFilter::DeletedDiscardableSharedMemoryOnFileThread( |
- DiscardableSharedMemoryId id) { |
- HostDiscardableSharedMemoryManager::current() |
- ->ChildDeletedDiscardableSharedMemory(id, render_process_id_); |
+ discardable_memory::DiscardableSharedMemoryId id) { |
+ discardable_memory::DiscardableSharedMemoryManager::current() |
+ ->ClientDeletedDiscardableSharedMemory(id, render_process_id_); |
} |
void RenderMessageFilter::OnDeletedDiscardableSharedMemory( |
- DiscardableSharedMemoryId id) { |
+ discardable_memory::DiscardableSharedMemoryId id) { |
BrowserThread::PostTask( |
BrowserThread::FILE_USER_BLOCKING, FROM_HERE, |
base::Bind( |