| Index: remoting/host/desktop_session_agent.cc
|
| diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc
|
| index dd5a3fbf7e70a7639440aa2fdf1bf3a6394cd410..faae51a99ce7d7fa2f0c6ce286b9123d6af2c1c6 100644
|
| --- a/remoting/host/desktop_session_agent.cc
|
| +++ b/remoting/host/desktop_session_agent.cc
|
| @@ -74,16 +74,8 @@ class DesktopSessionAgent::SharedBuffer : public webrtc::SharedMemory {
|
| size_t size,
|
| int id) {
|
| scoped_ptr<base::SharedMemory> memory(new base::SharedMemory());
|
| -#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| - // Remoting does not yet support Mach primitive backed SharedMemory, so
|
| - // force the underlying primitive to be a POSIX fd.
|
| - // https://crbug.com/547247.
|
| - if (!memory->CreateAndMapAnonymousPosix(size))
|
| - return nullptr;
|
| -#else
|
| if (!memory->CreateAndMapAnonymous(size))
|
| return nullptr;
|
| -#endif // defined(OS_MACOSX) && !defined(OS_IOS)
|
| return make_scoped_ptr(new SharedBuffer(agent, memory.Pass(), size, id));
|
| }
|
|
|
| @@ -199,16 +191,8 @@ webrtc::SharedMemory* DesktopSessionAgent::CreateSharedMemory(size_t size) {
|
| // speaking it never happens.
|
| next_shared_buffer_id_ += 2;
|
|
|
| - IPC::PlatformFileForTransit handle;
|
| -#if defined(OS_WIN)
|
| - handle = buffer->shared_memory()->handle().GetHandle(),
|
| -#else
|
| - handle =
|
| - base::FileDescriptor(base::SharedMemory::GetFdFromSharedMemoryHandle(
|
| - buffer->shared_memory()->handle()), false);
|
| -#endif
|
| SendToNetwork(new ChromotingDesktopNetworkMsg_CreateSharedBuffer(
|
| - buffer->id(), handle, buffer->size()));
|
| + buffer->id(), buffer->shared_memory()->handle(), buffer->size()));
|
| }
|
|
|
| return buffer.release();
|
|
|