diff options
author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 05:18:25 +0000 |
---|---|---|
committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 05:18:25 +0000 |
commit | ff72dd1d95125512b475bcaee0a4252aa057d3f2 (patch) | |
tree | 30387d00ef14a12a8ffd5160f1a70a9fafaa5776 /remoting/base | |
parent | 961419632602c1ef815439dbbb8c8693448e9be9 (diff) | |
download | chromium_src-ff72dd1d95125512b475bcaee0a4252aa057d3f2.zip chromium_src-ff72dd1d95125512b475bcaee0a4252aa057d3f2.tar.gz chromium_src-ff72dd1d95125512b475bcaee0a4252aa057d3f2.tar.bz2 |
DesktopSessionAgent now hosts the video capturer and provides necessary plumbing to drive it via an IPC channel.
BUG=134694
Review URL: https://chromiumcodereview.appspot.com/11413022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169587 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base')
-rw-r--r-- | remoting/base/shared_buffer.cc | 4 | ||||
-rw-r--r-- | remoting/base/shared_buffer.h | 10 | ||||
-rw-r--r-- | remoting/base/shared_buffer_unittest.cc | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/remoting/base/shared_buffer.cc b/remoting/base/shared_buffer.cc index 646f343..ff0bc93 100644 --- a/remoting/base/shared_buffer.cc +++ b/remoting/base/shared_buffer.cc @@ -15,7 +15,7 @@ SharedBuffer::SharedBuffer(uint32 size) } SharedBuffer::SharedBuffer( - intptr_t id, base::SharedMemoryHandle handle, uint32 size) + int id, base::SharedMemoryHandle handle, uint32 size) : id_(id), shared_memory_(handle, kReadOnly), size_(size) { @@ -23,7 +23,7 @@ SharedBuffer::SharedBuffer( } SharedBuffer::SharedBuffer( - intptr_t id, base::SharedMemoryHandle handle, base::ProcessHandle process, + int id, base::SharedMemoryHandle handle, base::ProcessHandle process, uint32 size) : id_(id), shared_memory_(handle, kReadOnly, process), diff --git a/remoting/base/shared_buffer.h b/remoting/base/shared_buffer.h index a25c862..7b144d16 100644 --- a/remoting/base/shared_buffer.h +++ b/remoting/base/shared_buffer.h @@ -27,12 +27,12 @@ class SharedBuffer // Opens an existing shared memory buffer and maps it to the memory of // the calling process (in read only mode). If the operation fails for any // reason, ptr() method will return NULL. - SharedBuffer(intptr_t id, base::SharedMemoryHandle handle, uint32 size); + SharedBuffer(int id, base::SharedMemoryHandle handle, uint32 size); // Opens an existing shared memory buffer created by a different process and // maps it to the memory of the calling process (in read only mode). If // the operation fails for any reason, ptr() method will return NULL. - SharedBuffer(intptr_t id, base::SharedMemoryHandle handle, + SharedBuffer(int id, base::SharedMemoryHandle handle, base::ProcessHandle process, uint32 size); // Returns pointer to the beginning of the allocated data buffer. Returns NULL @@ -43,17 +43,17 @@ class SharedBuffer // data buffer. base::SharedMemoryHandle handle() const { return shared_memory_.handle(); } - intptr_t id() const { return id_; } + int id() const { return id_; } uint32 size() const { return size_; } - void set_id(intptr_t id) { id_ = id; } + void set_id(int id) { id_ = id; } private: friend class base::RefCountedThreadSafe<SharedBuffer>; virtual ~SharedBuffer(); // Unique identifier of the buffer or 0 if ID hasn't been set. - intptr_t id_; + int id_; // Shared memory section backing up the buffer. base::SharedMemory shared_memory_; diff --git a/remoting/base/shared_buffer_unittest.cc b/remoting/base/shared_buffer_unittest.cc index d09de2c..bb7e57b 100644 --- a/remoting/base/shared_buffer_unittest.cc +++ b/remoting/base/shared_buffer_unittest.cc @@ -8,8 +8,8 @@ const uint32 kBufferSize = 4096; const int kPattern = 0x12345678; -const intptr_t kIdZero = 0; -const intptr_t kIdOne = 1; +const int kIdZero = 0; +const int kIdOne = 1; namespace remoting { |