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

Side by Side Diff: content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc

Issue 1154613006: Update pepper to not assume that SharedMemoryHandle is an int. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another nits pass. Created 5 years, 6 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 "content/renderer/pepper/pepper_proxy_channel_delegate_impl.h" 5 #include "content/renderer/pepper/pepper_proxy_channel_delegate_impl.h"
6 6
7 #include "content/child/child_process.h" 7 #include "content/child/child_process.h"
8 #include "content/common/sandbox_util.h" 8 #include "content/common/sandbox_util.h"
9 9
10 namespace content { 10 namespace content {
(...skipping 13 matching lines...) Expand all
24 } 24 }
25 25
26 IPC::PlatformFileForTransit 26 IPC::PlatformFileForTransit
27 PepperProxyChannelDelegateImpl::ShareHandleWithRemote( 27 PepperProxyChannelDelegateImpl::ShareHandleWithRemote(
28 base::PlatformFile handle, 28 base::PlatformFile handle,
29 base::ProcessId remote_pid, 29 base::ProcessId remote_pid,
30 bool should_close_source) { 30 bool should_close_source) {
31 return BrokerGetFileHandleForProcess(handle, remote_pid, should_close_source); 31 return BrokerGetFileHandleForProcess(handle, remote_pid, should_close_source);
32 } 32 }
33 33
34 base::SharedMemoryHandle
35 PepperProxyChannelDelegateImpl::ShareSharedMemoryHandleWithRemote(
36 const base::SharedMemoryHandle& handle,
37 base::ProcessId remote_pid) {
38 base::PlatformFile local_platform_file =
39 #if defined(OS_POSIX)
40 handle.fd;
41 #elif defined(OS_WIN)
42 handle;
43 #else
44 #error Not implemented.
45 #endif
46 return ShareHandleWithRemote(local_platform_file, remote_pid, false);
47 }
48
34 } // namespace content 49 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698