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

Side by Side Diff: ppapi/nacl_irt/ppapi_dispatcher.h

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 #ifndef PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_ 5 #ifndef PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_
6 #define PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_ 6 #define PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 int browser_ipc_fd, 51 int browser_ipc_fd,
52 int renderer_ipc_fd); 52 int renderer_ipc_fd);
53 53
54 // PluginDispatcher::PluginDelegate implementation. 54 // PluginDispatcher::PluginDelegate implementation.
55 base::SingleThreadTaskRunner* GetIPCTaskRunner() override; 55 base::SingleThreadTaskRunner* GetIPCTaskRunner() override;
56 base::WaitableEvent* GetShutdownEvent() override; 56 base::WaitableEvent* GetShutdownEvent() override;
57 IPC::PlatformFileForTransit ShareHandleWithRemote( 57 IPC::PlatformFileForTransit ShareHandleWithRemote(
58 base::PlatformFile handle, 58 base::PlatformFile handle,
59 base::ProcessId peer_pid, 59 base::ProcessId peer_pid,
60 bool should_close_source) override; 60 bool should_close_source) override;
61 base::SharedMemoryHandle ShareSharedMemoryHandleWithRemote(
62 const base::SharedMemoryHandle& handle,
63 base::ProcessId remote_pid) override;
61 std::set<PP_Instance>* GetGloballySeenInstanceIDSet() override; 64 std::set<PP_Instance>* GetGloballySeenInstanceIDSet() override;
62 uint32 Register(proxy::PluginDispatcher* plugin_dispatcher) override; 65 uint32 Register(proxy::PluginDispatcher* plugin_dispatcher) override;
63 void Unregister(uint32 plugin_dispatcher_id) override; 66 void Unregister(uint32 plugin_dispatcher_id) override;
64 67
65 // PluginProxyDelegate implementation. 68 // PluginProxyDelegate implementation.
66 IPC::Sender* GetBrowserSender() override; 69 IPC::Sender* GetBrowserSender() override;
67 std::string GetUILanguage() override; 70 std::string GetUILanguage() override;
68 void PreCacheFont(const void* logfontw) override; 71 void PreCacheFont(const void* logfontw) override;
69 void SetActiveURL(const std::string& url) override; 72 void SetActiveURL(const std::string& url) override;
70 PP_Resource CreateBrowserFont(proxy::Connection connection, 73 PP_Resource CreateBrowserFont(proxy::Connection connection,
(...skipping 18 matching lines...) Expand all
89 92
90 scoped_refptr<base::MessageLoopProxy> message_loop_; 93 scoped_refptr<base::MessageLoopProxy> message_loop_;
91 base::WaitableEvent* shutdown_event_; 94 base::WaitableEvent* shutdown_event_;
92 int renderer_ipc_fd_; 95 int renderer_ipc_fd_;
93 scoped_ptr<IPC::SyncChannel> channel_; 96 scoped_ptr<IPC::SyncChannel> channel_;
94 }; 97 };
95 98
96 } // namespace ppapi 99 } // namespace ppapi
97 100
98 #endif // PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_ 101 #endif // PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698