Pepper proxy: make the browser sender handle the proxy lock properly.

content/ppapi_plugin/ppapi_thread.cc

 // 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.
 
 #include "content/ppapi_plugin/ppapi_thread.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/process_util.h"
@@ skipping 55 matching lines @@
   WebKit::initialize(webkit_platform_support_.get());
 }
 
 PpapiThread::~PpapiThread() {
   ppapi::proxy::PluginGlobals::Get()->set_plugin_proxy_delegate(NULL);
   if (plugin_entry_points_.shutdown_module)
     plugin_entry_points_.shutdown_module();
   WebKit::shutdown();
 }
 
+bool PpapiThread::Send(IPC::Message* msg) {
+  // Allow access from multiple threads.
+  if (MessageLoop::current() == message_loop())
+    return ChildThread::Send(msg);
+
+  return sync_message_filter()->Send(msg);
+}
+
 // The "regular" ChildThread implements this function and does some standard
 // dispatching, then uses the message router. We don't actually need any of
 // this so this function just overrides that one.
 //
 // Note that this function is called only for messages from the channel to the
 // browser process. Messages from the renderer process are sent via a different
 // channel that ends up at Dispatcher::OnMessageReceived.
 bool PpapiThread::OnMessageReceived(const IPC::Message& msg) {
   IPC_BEGIN_MESSAGE_MAP(PpapiThread, msg)
     IPC_MESSAGE_HANDLER(PpapiMsg_LoadPlugin, OnMsgLoadPlugin)
@@ skipping 61 matching lines @@
 #endif
 
   return BrokerGetFileHandleForProcess(handle, channel.peer_pid(),
                                        should_close_source);
 }
 
 std::set<PP_Instance>* PpapiThread::GetGloballySeenInstanceIDSet() {
   return &globally_seen_instance_ids_;
 }
 
-bool PpapiThread::SendToBrowser(IPC::Message* msg) {
-  if (MessageLoop::current() == message_loop())
-    return ChildThread::Send(msg);
-
-  return sync_message_filter()->Send(msg);
-}
-
 IPC::Sender* PpapiThread::GetBrowserSender() {
   return this;
 }
 
 std::string PpapiThread::GetUILanguage() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   return command_line->GetSwitchValueASCII(switches::kLang);
 }
 
 void PpapiThread::PreCacheFont(const void* logfontw) {
@@ skipping 245 matching lines @@
 
   // plugin() is NULL when in-process.  Which is fine, because this is
   // just a hook for setting the process name.
   if (GetContentClient()->plugin()) {
     GetContentClient()->plugin()->PluginProcessStarted(
         path.BaseName().RemoveExtension().LossyDisplayName());
   }
 }
 
 }  // namespace content