OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "native_client/src/shared/platform/nacl_check.h" | 5 #include "native_client/src/shared/platform/nacl_check.h" |
6 #include "native_client/src/shared/ppapi_proxy/plugin_globals.h" | 6 #include "native_client/src/shared/ppapi_proxy/plugin_globals.h" |
7 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_core.h" | 7 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_core.h" |
8 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_var.h" | 8 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_var.h" |
9 #include "native_client/src/shared/ppapi_proxy/ppruntime.h" | 9 #include "native_client/src/shared/ppapi_proxy/ppruntime.h" |
10 #include "native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppp_rpc.h" | 10 #include "native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppp_rpc.h" |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 if (!NaClSrpcModuleInit()) { | 189 if (!NaClSrpcModuleInit()) { |
190 return 1; | 190 return 1; |
191 } | 191 } |
192 NaClLogModuleInit(); // Enable NaClLog'ing used by CHECK(). | 192 NaClLogModuleInit(); // Enable NaClLog'ing used by CHECK(). |
193 initialized = 1; | 193 initialized = 1; |
194 return 0; | 194 return 0; |
195 } | 195 } |
196 | 196 |
197 int PpapiPluginMain() { | 197 int PpapiPluginMain() { |
198 IrtInit(); | 198 IrtInit(); |
199 PpapiPluginRegisterDefaultThreadCreator(); | |
200 // Designate this as the main thread for PPB_Core::IsMainThread(). | 199 // Designate this as the main thread for PPB_Core::IsMainThread(). |
201 ppapi_proxy::PluginCore::MarkMainThread(); | 200 ppapi_proxy::PluginCore::MarkMainThread(); |
202 if (!NaClSrpcAcceptClientConnection(PppRpcs::srpc_methods)) { | 201 if (!NaClSrpcAcceptClientConnection(PppRpcs::srpc_methods)) { |
203 return 1; | 202 return 1; |
204 } | 203 } |
205 NaClSrpcModuleFini(); | 204 NaClSrpcModuleFini(); |
206 | 205 |
207 return 0; | 206 return 0; |
208 } | 207 } |
OLD | NEW |