Index: ppapi/proxy/plugin_dispatcher.h |
diff --git a/ppapi/proxy/plugin_dispatcher.h b/ppapi/proxy/plugin_dispatcher.h |
index f8e22f6ebdedb69ce9c8eaaeb77199aa80a5e071..f9c22f0664f017082880a88c8b6c7f31f2034543 100644 |
--- a/ppapi/proxy/plugin_dispatcher.h |
+++ b/ppapi/proxy/plugin_dispatcher.h |
@@ -140,12 +140,15 @@ class PPAPI_PROXY_EXPORT PluginDispatcher |
bool is_client); |
// Dispatcher overrides. |
- virtual bool IsPlugin() const; |
- virtual bool Send(IPC::Message* msg); |
+ virtual bool IsPlugin() const override; |
+ virtual bool Send(IPC::Message* msg) override; |
+ // Unlike |Send()|, this function continues to hold the Pepper proxy lock |
+ // unconditionally. |
+ virtual bool SendAndStayLocked(IPC::Message* msg) override; |
// IPC::Listener implementation. |
- virtual bool OnMessageReceived(const IPC::Message& msg); |
- virtual void OnChannelError(); |
+ virtual bool OnMessageReceived(const IPC::Message& msg) override; |
+ virtual void OnChannelError() override; |
dmichael(do not use this one)
2014/10/31 14:49:32
The new guidance is to use only one of "virtual" o
Peng
2014/10/31 14:55:38
I see. Done
|
// Keeps track of which dispatcher to use for each instance, active instances |
// and tracks associated data like the current size. |