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

Side by Side Diff: remoting/host/desktop_session_proxy.cc

Issue 1320783002: Make SharedMemoryHandle a class on windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ipc_global
Patch Set: Fix DCHECK. Created 5 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/host/desktop_session_proxy.h" 5 #include "remoting/host/desktop_session_proxy.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/process/process_handle.h" 9 #include "base/process/process_handle.h"
10 #include "base/memory/shared_memory.h" 10 #include "base/memory/shared_memory.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 : id_(id), 48 : id_(id),
49 #if defined(OS_WIN) 49 #if defined(OS_WIN)
50 shared_memory_(handle, kReadOnly, process), 50 shared_memory_(handle, kReadOnly, process),
51 #else // !defined(OS_WIN) 51 #else // !defined(OS_WIN)
52 shared_memory_(handle, kReadOnly), 52 shared_memory_(handle, kReadOnly),
53 #endif // !defined(OS_WIN) 53 #endif // !defined(OS_WIN)
54 size_(size) { 54 size_(size) {
55 if (!shared_memory_.Map(size)) { 55 if (!shared_memory_.Map(size)) {
56 LOG(ERROR) << "Failed to map a shared buffer: id=" << id 56 LOG(ERROR) << "Failed to map a shared buffer: id=" << id
57 #if defined(OS_WIN) 57 #if defined(OS_WIN)
58 << ", handle=" << handle 58 << ", handle=" << handle.GetHandle()
59 #else 59 #else
60 << ", handle.fd=" 60 << ", handle.fd="
61 << base::SharedMemory::GetFdFromSharedMemoryHandle(handle) 61 << base::SharedMemory::GetFdFromSharedMemoryHandle(handle)
62 #endif 62 #endif
63 << ", size=" << size; 63 << ", size=" << size;
64 } 64 }
65 } 65 }
66 66
67 int id() { return id_; } 67 int id() { return id_; }
68 size_t size() { return size_; } 68 size_t size() { return size_; }
69 void* memory() { return shared_memory_.memory(); } 69 void* memory() { return shared_memory_.memory(); }
70 webrtc::SharedMemory::Handle handle() { 70 webrtc::SharedMemory::Handle handle() {
71 #if defined(OS_WIN) 71 #if defined(OS_WIN)
72 return shared_memory_.handle(); 72 return shared_memory_.handle().GetHandle();
73 #else 73 #else
74 return base::SharedMemory::GetFdFromSharedMemoryHandle( 74 return base::SharedMemory::GetFdFromSharedMemoryHandle(
75 shared_memory_.handle()); 75 shared_memory_.handle());
76 #endif 76 #endif
77 } 77 }
78 78
79 private: 79 private:
80 virtual ~IpcSharedBufferCore() {} 80 virtual ~IpcSharedBufferCore() {}
81 friend class base::RefCountedThreadSafe<IpcSharedBufferCore>; 81 friend class base::RefCountedThreadSafe<IpcSharedBufferCore>;
82 82
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 FROM_HERE, base::Bind(&IpcAudioCapturer::OnAudioPacket, audio_capturer_, 479 FROM_HERE, base::Bind(&IpcAudioCapturer::OnAudioPacket, audio_capturer_,
480 base::Passed(&packet))); 480 base::Passed(&packet)));
481 } 481 }
482 482
483 void DesktopSessionProxy::OnCreateSharedBuffer( 483 void DesktopSessionProxy::OnCreateSharedBuffer(
484 int id, 484 int id,
485 IPC::PlatformFileForTransit handle, 485 IPC::PlatformFileForTransit handle,
486 uint32 size) { 486 uint32 size) {
487 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 487 DCHECK(caller_task_runner_->BelongsToCurrentThread());
488 488
489 #if defined(OS_WIN)
490 base::SharedMemoryHandle shm_handle =
491 base::SharedMemoryHandle(handle, base::GetCurrentProcId());
492 #else
489 base::SharedMemoryHandle shm_handle = base::SharedMemoryHandle(handle); 493 base::SharedMemoryHandle shm_handle = base::SharedMemoryHandle(handle);
494 #endif
490 scoped_refptr<IpcSharedBufferCore> shared_buffer = 495 scoped_refptr<IpcSharedBufferCore> shared_buffer =
491 new IpcSharedBufferCore(id, shm_handle, desktop_process_.Handle(), size); 496 new IpcSharedBufferCore(id, shm_handle, desktop_process_.Handle(), size);
492 497
493 if (shared_buffer->memory() != nullptr && 498 if (shared_buffer->memory() != nullptr &&
494 !shared_buffers_.insert(std::make_pair(id, shared_buffer)).second) { 499 !shared_buffers_.insert(std::make_pair(id, shared_buffer)).second) {
495 LOG(ERROR) << "Duplicate shared buffer id " << id << " encountered"; 500 LOG(ERROR) << "Duplicate shared buffer id " << id << " encountered";
496 } 501 }
497 } 502 }
498 503
499 void DesktopSessionProxy::OnReleaseSharedBuffer(int id) { 504 void DesktopSessionProxy::OnReleaseSharedBuffer(int id) {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 } 585 }
581 586
582 // static 587 // static
583 void DesktopSessionProxyTraits::Destruct( 588 void DesktopSessionProxyTraits::Destruct(
584 const DesktopSessionProxy* desktop_session_proxy) { 589 const DesktopSessionProxy* desktop_session_proxy) {
585 desktop_session_proxy->caller_task_runner_->DeleteSoon(FROM_HERE, 590 desktop_session_proxy->caller_task_runner_->DeleteSoon(FROM_HERE,
586 desktop_session_proxy); 591 desktop_session_proxy);
587 } 592 }
588 593
589 } // namespace remoting 594 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698