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

Unified Diff: remoting/host/desktop_session_agent.cc

Issue 1509723003: Remove dependency on webrtc::SharedMemory::handle() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_quic
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
« no previous file with comments | « no previous file | remoting/host/desktop_session_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_session_agent.cc
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc
index 2e486c5b486b1930412a129e00da68c1b2be7dc0..dd5a3fbf7e70a7639440aa2fdf1bf3a6394cd410 100644
--- a/remoting/host/desktop_session_agent.cc
+++ b/remoting/host/desktop_session_agent.cc
@@ -89,23 +89,16 @@ class DesktopSessionAgent::SharedBuffer : public webrtc::SharedMemory {
~SharedBuffer() override { agent_->OnSharedBufferDeleted(id()); }
+ base::SharedMemory* shared_memory() { return shared_memory_.get(); }
+
private:
SharedBuffer(DesktopSessionAgent* agent,
scoped_ptr<base::SharedMemory> memory,
size_t size,
int id)
- : SharedMemory(memory->memory(),
- size,
-#if defined(OS_WIN)
- memory->handle().GetHandle(),
-#else
- base::SharedMemory::GetFdFromSharedMemoryHandle(
- memory->handle()),
-#endif
- id),
+ : SharedMemory(memory->memory(), size, 0, id),
agent_(agent),
- shared_memory_(memory.Pass()) {
- }
+ shared_memory_(memory.Pass()) {}
DesktopSessionAgent* agent_;
scoped_ptr<base::SharedMemory> shared_memory_;
@@ -208,9 +201,11 @@ webrtc::SharedMemory* DesktopSessionAgent::CreateSharedMemory(size_t size) {
IPC::PlatformFileForTransit handle;
#if defined(OS_WIN)
- handle = buffer->handle();
+ handle = buffer->shared_memory()->handle().GetHandle(),
#else
- handle = base::FileDescriptor(buffer->handle(), false);
+ handle =
+ base::FileDescriptor(base::SharedMemory::GetFdFromSharedMemoryHandle(
+ buffer->shared_memory()->handle()), false);
#endif
SendToNetwork(new ChromotingDesktopNetworkMsg_CreateSharedBuffer(
buffer->id(), handle, buffer->size()));
« no previous file with comments | « no previous file | remoting/host/desktop_session_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698