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

Side by Side Diff: ppapi/proxy/plugin_dispatcher.h

Issue 692683003: Hold the Pepper proxy lock for all Pepper GL calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « no previous file | ppapi/proxy/plugin_dispatcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 PPAPI_PROXY_PLUGIN_DISPATCHER_H_ 5 #ifndef PPAPI_PROXY_PLUGIN_DISPATCHER_H_
6 #define PPAPI_PROXY_PLUGIN_DISPATCHER_H_ 6 #define PPAPI_PROXY_PLUGIN_DISPATCHER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 // You must call this function before anything else. Returns true on success. 134 // You must call this function before anything else. Returns true on success.
135 // The delegate pointer must outlive this class, ownership is not 135 // The delegate pointer must outlive this class, ownership is not
136 // transferred. 136 // transferred.
137 bool InitPluginWithChannel(PluginDelegate* delegate, 137 bool InitPluginWithChannel(PluginDelegate* delegate,
138 base::ProcessId peer_pid, 138 base::ProcessId peer_pid,
139 const IPC::ChannelHandle& channel_handle, 139 const IPC::ChannelHandle& channel_handle,
140 bool is_client); 140 bool is_client);
141 141
142 // Dispatcher overrides. 142 // Dispatcher overrides.
143 virtual bool IsPlugin() const; 143 virtual bool IsPlugin() const;
144 virtual bool Send(IPC::Message* msg); 144 virtual bool Send(IPC::Message* msg);
dmichael (off chromium) 2014/10/30 21:20:56 Wait, why are these marked virtual? I would expect
Peng 2014/10/31 13:50:56 Done.
145 virtual bool SendAndStayLocked(IPC::Message* msg);
dmichael (off chromium) 2014/10/30 21:20:56 And this one is not an override and should not be
Peng 2014/10/31 13:50:56 Actually this one is a virtual function, because t
145 146
146 // IPC::Listener implementation. 147 // IPC::Listener implementation.
147 virtual bool OnMessageReceived(const IPC::Message& msg); 148 virtual bool OnMessageReceived(const IPC::Message& msg);
148 virtual void OnChannelError(); 149 virtual void OnChannelError();
149 150
150 // Keeps track of which dispatcher to use for each instance, active instances 151 // Keeps track of which dispatcher to use for each instance, active instances
151 // and tracks associated data like the current size. 152 // and tracks associated data like the current size.
152 void DidCreateInstance(PP_Instance instance); 153 void DidCreateInstance(PP_Instance instance);
153 void DidDestroyInstance(PP_Instance instance); 154 void DidDestroyInstance(PP_Instance instance);
154 155
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 // A filter for sending messages from threads other than the main thread. 207 // A filter for sending messages from threads other than the main thread.
207 scoped_refptr<IPC::SyncMessageFilter> sync_filter_; 208 scoped_refptr<IPC::SyncMessageFilter> sync_filter_;
208 209
209 DISALLOW_COPY_AND_ASSIGN(PluginDispatcher); 210 DISALLOW_COPY_AND_ASSIGN(PluginDispatcher);
210 }; 211 };
211 212
212 } // namespace proxy 213 } // namespace proxy
213 } // namespace ppapi 214 } // namespace ppapi
214 215
215 #endif // PPAPI_PROXY_PLUGIN_DISPATCHER_H_ 216 #endif // PPAPI_PROXY_PLUGIN_DISPATCHER_H_
OLDNEW
« no previous file with comments | « no previous file | ppapi/proxy/plugin_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698