Never lock the Pepper proxy lock on the IO thread

ppapi/proxy/plugin_globals.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PPAPI_PROXY_PLUGIN_GLOBALS_H_
 #define PPAPI_PROXY_PLUGIN_GLOBALS_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_local_storage.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/plugin_var_tracker.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/callback_tracker.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 
 namespace base {
 class Thread;
 }
 namespace IPC {
 class Sender;
 }
 
 struct PP_BrowserFont_Trusted_Description;
 
 namespace ppapi {
 
 struct Preferences;
 
 namespace proxy {
 
 class MessageLoopResource;
+class PluginMessageFilter;
 class PluginProxyDelegate;
 class ResourceReplyThreadRegistrar;
+class UDPSocketFilter;
 
 class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals {
  public:
-  PluginGlobals();
-  explicit PluginGlobals(PpapiGlobals::PerThreadForTest);
+  explicit PluginGlobals(const scoped_refptr<base::TaskRunner>& task_runner);
+  PluginGlobals(PpapiGlobals::PerThreadForTest,
+                const scoped_refptr<base::TaskRunner>& task_runner);
   virtual ~PluginGlobals();
 
   // Getter for the global singleton. Generally, you should use
   // PpapiGlobals::Get() when possible. Use this only when you need some
   // plugin-specific functionality.
   inline static PluginGlobals* Get() {
     // Explicitly crash if this is the wrong process type, we want to get
     // crash reports.
     CHECK(PpapiGlobals::Get()->IsPluginGlobals());
     return static_cast<PluginGlobals*>(PpapiGlobals::Get());
@@ skipping 19 matching lines @@
                                       PP_LogLevel level,
                                       const std::string& source,
                                       const std::string& value) override;
   virtual MessageLoopShared* GetCurrentMessageLoop() override;
   base::TaskRunner* GetFileTaskRunner() override;
   virtual void MarkPluginIsActive() override;
 
   // Returns the channel for sending to the browser.
   IPC::Sender* GetBrowserSender();
 
+  base::TaskRunner* ipc_task_runner() { return ipc_task_runner_.get(); }
+
   // Returns the language code of the current UI language.
   std::string GetUILanguage();
 
   // Sets the active url which is reported by breakpad.
   void SetActiveURL(const std::string& url);
 
   PP_Resource CreateBrowserFont(
       Connection connection,
       PP_Instance instance,
       const PP_BrowserFont_Trusted_Description& desc,
@@ skipping 37 matching lines @@
   // is known. This will be used for error logging.
   void set_plugin_name(const std::string& name) { plugin_name_ = name; }
 
   // The embedder should call this function when the command line is known.
   void set_command_line(const std::string& c) { command_line_ = c; }
 
   ResourceReplyThreadRegistrar* resource_reply_thread_registrar() {
     return resource_reply_thread_registrar_.get();
   }
 
+  UDPSocketFilter* udp_socket_filter() const {
+    return udp_socket_filter_.get();
+  }
+  // Add any necessary ResourceMessageFilters to the PluginMessageFilter so
+  // that they can receive and handle appropriate messages on the IO thread.
+  void RegisterResourceMessageFilters(
+      ppapi::proxy::PluginMessageFilter* plugin_filter);
+
   // Interval to limit how many IPC messages are sent indicating that the plugin
   // is active and should be kept alive. The value must be smaller than any
   // threshold used to kill inactive plugins by the embedder host.
   void set_keepalive_throttle_interval_milliseconds(unsigned i);
 
  private:
   class BrowserSender;
 
   // PpapiGlobals overrides.
   virtual bool IsPluginGlobals() const override;
@@ skipping 16 matching lines @@
   // Name of the plugin used for error logging. This will be empty until
   // set_plugin_name is called.
   std::string plugin_name_;
 
   // Command line for the plugin. This will be empty until set_command_line is
   // called.
   std::string command_line_;
 
   scoped_ptr<BrowserSender> browser_sender_;
 
+  scoped_refptr<base::TaskRunner> ipc_task_runner_;
+
   // Thread for performing potentially blocking file operations. It's created
   // lazily, since it might not be needed.
   scoped_ptr<base::Thread> file_thread_;
 
   scoped_refptr<ResourceReplyThreadRegistrar> resource_reply_thread_registrar_;
 
+  scoped_refptr<UDPSocketFilter> udp_socket_filter_;
+
   // Indicates activity by the plugin. Used to monitor when a plugin can be
   // shutdown due to idleness. Current needs do not require differentiating
   // between idle state between multiple instances, if any are active they are
   // all considered active.
   bool plugin_recently_active_;
 
   unsigned keepalive_throttle_interval_milliseconds_;
 
   // Member variables should appear before the WeakPtrFactory, see weak_ptr.h.
   base::WeakPtrFactory<PluginGlobals> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginGlobals);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif   // PPAPI_PROXY_PLUGIN_GLOBALS_H_