OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. |
3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
5 */ | 5 */ |
6 | 6 |
7 #include "native_client/src/shared/platform/nacl_time.h" | 7 #include "native_client/src/shared/platform/nacl_time.h" |
8 #include "native_client/src/trusted/desc/nrd_all_modules.h" | 8 #include "native_client/src/trusted/desc/nrd_all_modules.h" |
9 #include "native_client/src/trusted/handle_pass/browser_handle.h" | 9 #include "native_client/src/trusted/handle_pass/browser_handle.h" |
10 #include "native_client/src/trusted/plugin/nacl_entry_points.h" | 10 #include "native_client/src/trusted/plugin/nacl_entry_points.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 | 42 |
43 if (NULL == private_interface_) { | 43 if (NULL == private_interface_) { |
44 MODULE_PRINTF(("ModulePpapi::Init failed: " | 44 MODULE_PRINTF(("ModulePpapi::Init failed: " |
45 "GetBrowserInterface returned NULL\n")); | 45 "GetBrowserInterface returned NULL\n")); |
46 return false; | 46 return false; |
47 } | 47 } |
48 | 48 |
49 launch_nacl_process = reinterpret_cast<LaunchNaClProcessFunc>( | 49 launch_nacl_process = reinterpret_cast<LaunchNaClProcessFunc>( |
50 private_interface_->LaunchSelLdr); | 50 private_interface_->LaunchSelLdr); |
51 get_urandom_fd = private_interface_->UrandomFD; | 51 get_urandom_fd = private_interface_->UrandomFD; |
| 52 plugin::get_readonly_pnacl_fd = private_interface_->GetReadonlyPnaclFd; |
52 | 53 |
53 // In the plugin, we don't need high resolution time of day. | 54 // In the plugin, we don't need high resolution time of day. |
54 NaClAllowLowResolutionTimeOfDay(); | 55 NaClAllowLowResolutionTimeOfDay(); |
55 NaClNrdAllModulesInit(); | 56 NaClNrdAllModulesInit(); |
56 NaClSrpcModuleInit(); | 57 NaClSrpcModuleInit(); |
57 | 58 |
58 #if NACL_WINDOWS && !defined(NACL_STANDALONE) | 59 #if NACL_WINDOWS && !defined(NACL_STANDALONE) |
59 NaClHandlePassBrowserInit(); | 60 NaClHandlePassBrowserInit(); |
60 #endif | 61 #endif |
61 init_was_successful_ = true; | 62 init_was_successful_ = true; |
(...skipping 21 matching lines...) Expand all Loading... |
83 | 84 |
84 | 85 |
85 namespace pp { | 86 namespace pp { |
86 | 87 |
87 Module* CreateModule() { | 88 Module* CreateModule() { |
88 MODULE_PRINTF(("CreateModule ()\n")); | 89 MODULE_PRINTF(("CreateModule ()\n")); |
89 return new plugin::ModulePpapi(); | 90 return new plugin::ModulePpapi(); |
90 } | 91 } |
91 | 92 |
92 } // namespace pp | 93 } // namespace pp |
OLD | NEW |