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

Side by Side Diff: src/trusted/service_runtime/sel_main_chrome.h

Issue 11743028: Partly change IRT load-skipping to be explicit. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The Native Client Authors. All rights reserved. 2 * Copyright (c) 2012 The Native Client 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 #ifndef NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_SEL_MAIN_CHROME_H_ 7 #ifndef NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_SEL_MAIN_CHROME_H_
8 #define NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_SEL_MAIN_CHROME_H_ 1 8 #define NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_SEL_MAIN_CHROME_H_ 1
9 9
10 #include "native_client/src/include/nacl_base.h" 10 #include "native_client/src/include/nacl_base.h"
(...skipping 16 matching lines...) Expand all
27 struct NaClChromeMainArgs { 27 struct NaClChromeMainArgs {
28 /* 28 /*
29 * Handle for bootstrapping a NaCl IMC connection to the trusted 29 * Handle for bootstrapping a NaCl IMC connection to the trusted
30 * PPAPI plugin. Required. 30 * PPAPI plugin. Required.
31 */ 31 */
32 NaClHandle imc_bootstrap_handle; 32 NaClHandle imc_bootstrap_handle;
33 33
34 /* 34 /*
35 * File descriptor for the NaCl integrated runtime (IRT) library. 35 * File descriptor for the NaCl integrated runtime (IRT) library.
36 * Note that this is a file descriptor even on Windows (where file 36 * Note that this is a file descriptor even on Windows (where file
37 * descriptors are emulated by the C runtime library). Required. 37 * descriptors are emulated by the C runtime library). Optional; may be -1.
Mark Seaborn 2013/01/03 23:36:40 Nit: can you word-wrap to roughly the same length
jvoung (off chromium) 2013/01/04 00:05:31 Done.
38 * This is only optional for non-ABI stable nexes.
Mark Seaborn 2013/01/03 23:36:40 "optional when loading nexes that don't follow NaC
jvoung (off chromium) 2013/01/04 00:05:31 Done.
38 */ 39 */
39 int irt_fd; 40 int irt_fd;
40 41
41 /* 42 /*
42 * Descriptor to provide to untrusted code as descriptor number 43 * Descriptor to provide to untrusted code as descriptor number
43 * NACL_CHROME_INITIAL_IPC_DESC. For use by the Chrome-IPC-based 44 * NACL_CHROME_INITIAL_IPC_DESC. For use by the Chrome-IPC-based
44 * PPAPI proxy. Optional; may be NULL. 45 * PPAPI proxy. Optional; may be NULL.
45 */ 46 */
46 struct NaClDesc *initial_ipc_desc; 47 struct NaClDesc *initial_ipc_desc;
47 48
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 /* Create a new args struct containing default values. */ 110 /* Create a new args struct containing default values. */
110 struct NaClChromeMainArgs *NaClChromeMainArgsCreate(void); 111 struct NaClChromeMainArgs *NaClChromeMainArgsCreate(void);
111 112
112 /* Launch NaCl. */ 113 /* Launch NaCl. */
113 void NaClChromeMainStart(struct NaClChromeMainArgs *args); 114 void NaClChromeMainStart(struct NaClChromeMainArgs *args);
114 115
115 116
116 EXTERN_C_END 117 EXTERN_C_END
117 118
118 #endif 119 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698