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

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

Issue 568793002: PPAPI: Fix GetBrowserInterface race conditions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments Created 6 years, 3 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/proxy/interface_list.h » ('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
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 if (!NaClSrpcAcceptClientOnThread(srpc_methods)) { 45 if (!NaClSrpcAcceptClientOnThread(srpc_methods)) {
46 return 1; 46 return 1;
47 } 47 }
48 #endif 48 #endif
49 49
50 ppapi::PpapiDispatcher ppapi_dispatcher( 50 ppapi::PpapiDispatcher ppapi_dispatcher(
51 ppapi::GetIOThread()->message_loop_proxy(), 51 ppapi::GetIOThread()->message_loop_proxy(),
52 ppapi::GetShutdownEvent(), 52 ppapi::GetShutdownEvent(),
53 ppapi::GetBrowserIPCFileDescriptor(), 53 ppapi::GetBrowserIPCFileDescriptor(),
54 ppapi::GetRendererIPCFileDescriptor()); 54 ppapi::GetRendererIPCFileDescriptor());
55 plugin_globals.set_plugin_proxy_delegate(&ppapi_dispatcher); 55 plugin_globals.SetPluginProxyDelegate(&ppapi_dispatcher);
56 56
57 loop.Run(); 57 loop.Run();
58 58
59 return 0; 59 return 0;
60 } 60 }
OLDNEW
« no previous file with comments | « content/ppapi_plugin/ppapi_thread.cc ('k') | ppapi/proxy/interface_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698