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

Side by Side Diff: content/ppapi_plugin/ppapi_thread.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 (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 #ifndef CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ 5 #ifndef CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_
6 #define CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ 6 #define CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 void OnChannelConnected(int32 peer_pid) override; 73 void OnChannelConnected(int32 peer_pid) override;
74 74
75 // PluginDispatcher::PluginDelegate implementation. 75 // PluginDispatcher::PluginDelegate implementation.
76 std::set<PP_Instance>* GetGloballySeenInstanceIDSet() override; 76 std::set<PP_Instance>* GetGloballySeenInstanceIDSet() override;
77 base::SingleThreadTaskRunner* GetIPCTaskRunner() override; 77 base::SingleThreadTaskRunner* GetIPCTaskRunner() override;
78 base::WaitableEvent* GetShutdownEvent() override; 78 base::WaitableEvent* GetShutdownEvent() override;
79 IPC::PlatformFileForTransit ShareHandleWithRemote( 79 IPC::PlatformFileForTransit ShareHandleWithRemote(
80 base::PlatformFile handle, 80 base::PlatformFile handle,
81 base::ProcessId peer_pid, 81 base::ProcessId peer_pid,
82 bool should_close_source) override; 82 bool should_close_source) override;
83 base::SharedMemoryHandle ShareSharedMemoryHandleWithRemote(
84 const base::SharedMemoryHandle& handle,
85 base::ProcessId remote_pid) override;
83 uint32 Register(ppapi::proxy::PluginDispatcher* plugin_dispatcher) override; 86 uint32 Register(ppapi::proxy::PluginDispatcher* plugin_dispatcher) override;
84 void Unregister(uint32 plugin_dispatcher_id) override; 87 void Unregister(uint32 plugin_dispatcher_id) override;
85 88
86 // PluginProxyDelegate. 89 // PluginProxyDelegate.
87 // SendToBrowser() is intended to be safe to use on another thread so 90 // SendToBrowser() is intended to be safe to use on another thread so
88 // long as the main PpapiThread outlives it. 91 // long as the main PpapiThread outlives it.
89 IPC::Sender* GetBrowserSender() override; 92 IPC::Sender* GetBrowserSender() override;
90 std::string GetUILanguage() override; 93 std::string GetUILanguage() override;
91 void PreCacheFont(const void* logfontw) override; 94 void PreCacheFont(const void* logfontw) override;
92 void SetActiveURL(const std::string& url) override; 95 void SetActiveURL(const std::string& url) override;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread); 167 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread);
165 }; 168 };
166 169
167 #if defined(COMPILER_MSVC) 170 #if defined(COMPILER_MSVC)
168 #pragma warning(pop) 171 #pragma warning(pop)
169 #endif 172 #endif
170 173
171 } // namespace content 174 } // namespace content
172 175
173 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ 176 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698