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

Side by Side Diff: ppapi/nacl_irt/ppapi_dispatcher.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ppapi/nacl_irt/ppapi_dispatcher.h" 5 #include "ppapi/nacl_irt/ppapi_dispatcher.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 return shutdown_event_; 65 return shutdown_event_;
66 } 66 }
67 67
68 IPC::PlatformFileForTransit PpapiDispatcher::ShareHandleWithRemote( 68 IPC::PlatformFileForTransit PpapiDispatcher::ShareHandleWithRemote(
69 base::PlatformFile handle, 69 base::PlatformFile handle,
70 base::ProcessId peer_pid, 70 base::ProcessId peer_pid,
71 bool should_close_source) { 71 bool should_close_source) {
72 return IPC::InvalidPlatformFileForTransit(); 72 return IPC::InvalidPlatformFileForTransit();
73 } 73 }
74 74
75 base::SharedMemoryHandle PpapiDispatcher::ShareSharedMemoryHandleWithRemote(
76 const base::SharedMemoryHandle& handle,
77 base::ProcessId remote_pid) {
78 return base::SharedMemory::NULLHandle();
79 }
80
75 std::set<PP_Instance>* PpapiDispatcher::GetGloballySeenInstanceIDSet() { 81 std::set<PP_Instance>* PpapiDispatcher::GetGloballySeenInstanceIDSet() {
76 return &instances_; 82 return &instances_;
77 } 83 }
78 84
79 uint32 PpapiDispatcher::Register(proxy::PluginDispatcher* plugin_dispatcher) { 85 uint32 PpapiDispatcher::Register(proxy::PluginDispatcher* plugin_dispatcher) {
80 if (!plugin_dispatcher || 86 if (!plugin_dispatcher ||
81 plugin_dispatchers_.size() >= std::numeric_limits<uint32>::max()) { 87 plugin_dispatchers_.size() >= std::numeric_limits<uint32>::max()) {
82 return 0; 88 return 0;
83 } 89 }
84 90
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 NOTREACHED(); 208 NOTREACHED();
203 return; 209 return;
204 } 210 }
205 std::map<uint32, proxy::PluginDispatcher*>::iterator dispatcher = 211 std::map<uint32, proxy::PluginDispatcher*>::iterator dispatcher =
206 plugin_dispatchers_.find(id); 212 plugin_dispatchers_.find(id);
207 if (dispatcher != plugin_dispatchers_.end()) 213 if (dispatcher != plugin_dispatchers_.end())
208 dispatcher->second->OnMessageReceived(msg); 214 dispatcher->second->OnMessageReceived(msg);
209 } 215 }
210 216
211 } // namespace ppapi 217 } // namespace ppapi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698