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

Unified Diff: remoting/host/desktop_session_proxy.cc

Issue 1509063003: Remoting: Remove references to POSIX shared memory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@temp57_base
Patch Set: Created 5 years 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: remoting/host/desktop_session_proxy.cc
diff --git a/remoting/host/desktop_session_proxy.cc b/remoting/host/desktop_session_proxy.cc
index 6166d20aa5af2a0103411ab7ba2d89a85fa8a036..0e255df47545ba7f376b60ef773d4da7e7ea5c2e 100644
--- a/remoting/host/desktop_session_proxy.cc
+++ b/remoting/host/desktop_session_proxy.cc
@@ -54,12 +54,6 @@ class DesktopSessionProxy::IpcSharedBufferCore
size_(size) {
if (!shared_memory_.Map(size)) {
LOG(ERROR) << "Failed to map a shared buffer: id=" << id
-#if defined(OS_WIN)
- << ", handle=" << handle.GetHandle()
-#else
- << ", handle.fd="
- << base::SharedMemory::GetFdFromSharedMemoryHandle(handle)
-#endif
<< ", size=" << size;
}
}
@@ -470,18 +464,12 @@ void DesktopSessionProxy::OnAudioPacket(const std::string& serialized_packet) {
void DesktopSessionProxy::OnCreateSharedBuffer(
int id,
- IPC::PlatformFileForTransit handle,
+ base::SharedMemoryHandle handle,
uint32 size) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
-#if defined(OS_WIN)
- base::SharedMemoryHandle shm_handle =
- base::SharedMemoryHandle(handle, base::GetCurrentProcId());
-#else
- base::SharedMemoryHandle shm_handle = base::SharedMemoryHandle(handle);
-#endif
scoped_refptr<IpcSharedBufferCore> shared_buffer =
- new IpcSharedBufferCore(id, shm_handle, desktop_process_.Handle(), size);
+ new IpcSharedBufferCore(id, handle, desktop_process_.Handle(), size);
if (shared_buffer->memory() != nullptr &&
!shared_buffers_.insert(std::make_pair(id, shared_buffer)).second) {

Powered by Google App Engine
This is Rietveld 408576698