OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2009, Google Inc. | 2 * Copyright 2009, Google Inc. |
3 * All rights reserved. | 3 * All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 20 matching lines...) Expand all Loading... | |
31 | 31 |
32 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NACL_ENTRY_POINTS_H_ | 32 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NACL_ENTRY_POINTS_H_ |
33 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NACL_ENTRY_POINTS_H_ | 33 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NACL_ENTRY_POINTS_H_ |
34 | 34 |
35 #include <stddef.h> | 35 #include <stddef.h> |
36 | 36 |
37 #include <map> | 37 #include <map> |
38 #include <string> | 38 #include <string> |
39 | 39 |
40 #include "native_client/src/shared/imc/nacl_imc.h" | 40 #include "native_client/src/shared/imc/nacl_imc.h" |
41 #include "ppapi/c/pp_instance.h" | |
41 | 42 |
42 | 43 |
43 typedef bool (*LaunchNaClProcessFunc)(const char* url, | 44 typedef bool (*LaunchNaClProcessFunc)(int instance, const char* url, |
dmichael (off chromium)
2012/04/27 17:14:36
You included PP_Instance; did you mean for that to
bbudge
2012/04/27 17:46:56
Yep. This will be PP_Instance after Mark makes his
| |
44 int socket_count, | 45 int socket_count, |
45 nacl::Handle* result_sockets, | 46 nacl::Handle* result_sockets, |
46 nacl::Handle* nacl_process_handle, | 47 nacl::Handle* nacl_process_handle, |
47 int* nacl_process_id); | 48 int* nacl_process_id); |
48 | 49 |
49 typedef int (*GetURandomFDFunc)(void); | 50 typedef int (*GetURandomFDFunc)(void); |
50 | 51 |
51 | 52 |
52 extern LaunchNaClProcessFunc launch_nacl_process; | 53 extern LaunchNaClProcessFunc launch_nacl_process; |
53 extern GetURandomFDFunc get_urandom_fd; | 54 extern GetURandomFDFunc get_urandom_fd; |
54 | 55 |
55 // Registers the internal NaCl plugin with PluginList. | 56 // Registers the internal NaCl plugin with PluginList. |
56 // Old version. TODO(mseaborn): Remove this eventually, when Chromium | 57 // Old version. TODO(mseaborn): Remove this eventually, when Chromium |
57 // has stopped using it for a while. Note that this is still called | 58 // has stopped using it for a while. Note that this is still called |
58 // by Chromium in the browser process. | 59 // by Chromium in the browser process. |
59 void RegisterInternalNaClPlugin(); | 60 void RegisterInternalNaClPlugin(); |
60 // New version. | 61 // New version. |
61 void RegisterInternalNaClPlugin(const std::map<std::string, uintptr_t>& funcs); | 62 void RegisterInternalNaClPlugin(const std::map<std::string, uintptr_t>& funcs); |
62 | 63 |
63 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NACL_ENTRY_POINTS_H_ | 64 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NACL_ENTRY_POINTS_H_ |
OLD | NEW |