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

Side by Side Diff: ppapi/nacl_irt/plugin_main.cc

Issue 869883003: Never lock the Pepper proxy lock on the IO thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix size_t vs int32_t Created 5 years, 8 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
« no previous file with comments | « content/ppapi_plugin/ppapi_thread.cc ('k') | ppapi/nacl_irt/ppapi_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "ppapi/nacl_irt/plugin_main.h" 5 #include "ppapi/nacl_irt/plugin_main.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 // Need to include this before most other files because it defines 8 // Need to include this before most other files because it defines
9 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define 9 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define
10 // IPC_MESSAGE_MACROS_LOG_ENABLED so ppapi_messages.h will generate the 10 // IPC_MESSAGE_MACROS_LOG_ENABLED so ppapi_messages.h will generate the
11 // ViewMsgLog et al. functions. 11 // ViewMsgLog et al. functions.
12 12
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
15 #include "ipc/ipc_logging.h" 15 #include "ipc/ipc_logging.h"
16 #include "ppapi/nacl_irt/plugin_startup.h" 16 #include "ppapi/nacl_irt/plugin_startup.h"
17 #include "ppapi/nacl_irt/ppapi_dispatcher.h" 17 #include "ppapi/nacl_irt/ppapi_dispatcher.h"
18 #include "ppapi/proxy/plugin_globals.h" 18 #include "ppapi/proxy/plugin_globals.h"
19 #include "ppapi/shared_impl/ppb_audio_shared.h" 19 #include "ppapi/shared_impl/ppb_audio_shared.h"
20 20
21 void PpapiPluginRegisterThreadCreator( 21 void PpapiPluginRegisterThreadCreator(
22 const struct PP_ThreadFunctions* thread_functions) { 22 const struct PP_ThreadFunctions* thread_functions) {
23 // Initialize all classes that need to create threads that call back into 23 // Initialize all classes that need to create threads that call back into
24 // user code. 24 // user code.
25 ppapi::PPB_Audio_Shared::SetThreadFunctions(thread_functions); 25 ppapi::PPB_Audio_Shared::SetThreadFunctions(thread_functions);
26 } 26 }
27 27
28 int PpapiPluginMain() { 28 int PpapiPluginMain() {
29 base::MessageLoop loop; 29 base::MessageLoop loop;
30 ppapi::proxy::PluginGlobals plugin_globals; 30 ppapi::proxy::PluginGlobals plugin_globals(
31 scoped_refptr<base::TaskRunner>(
32 ppapi::GetIOThread()->message_loop_proxy()));
31 33
32 ppapi::PpapiDispatcher ppapi_dispatcher( 34 ppapi::PpapiDispatcher ppapi_dispatcher(
33 ppapi::GetIOThread()->message_loop_proxy(), 35 ppapi::GetIOThread()->message_loop_proxy(),
34 ppapi::GetShutdownEvent(), 36 ppapi::GetShutdownEvent(),
35 ppapi::GetBrowserIPCFileDescriptor(), 37 ppapi::GetBrowserIPCFileDescriptor(),
36 ppapi::GetRendererIPCFileDescriptor()); 38 ppapi::GetRendererIPCFileDescriptor());
37 plugin_globals.SetPluginProxyDelegate(&ppapi_dispatcher); 39 plugin_globals.SetPluginProxyDelegate(&ppapi_dispatcher);
38 40
39 loop.Run(); 41 loop.Run();
40 42
41 return 0; 43 return 0;
42 } 44 }
OLDNEW
« no previous file with comments | « content/ppapi_plugin/ppapi_thread.cc ('k') | ppapi/nacl_irt/ppapi_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698