Chromium Code Reviews Chromium Code Reviews
Issue 135853021:
NaCl: Expose NaClApp to embedding layer. (Closed)
Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master| OLD | NEW |
|---|---|
| 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 #include <fcntl.h> | 7 #include <fcntl.h> |
| 8 | 8 |
| 9 #if NACL_WINDOWS | 9 #if NACL_WINDOWS |
| 10 # include <io.h> | 10 # include <io.h> |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 128 thread_args.channel = socketpair[1]; | 128 thread_args.channel = socketpair[1]; |
| 129 | 129 |
| 130 // Check that NaClDescMakeCustomDesc() works when called before | 130 // Check that NaClDescMakeCustomDesc() works when called before |
| 131 // NaClChromeMainStart(). | 131 // NaClChromeMainStart(). |
| 132 args->initial_ipc_desc = MakeExampleDesc(); | 132 args->initial_ipc_desc = MakeExampleDesc(); |
| 133 | 133 |
| 134 NaClThread thread; | 134 NaClThread thread; |
| 135 CHECK(NaClThreadCtor(&thread, DummyRendererThread, &thread_args, | 135 CHECK(NaClThreadCtor(&thread, DummyRendererThread, &thread_args, |
| 136 NACL_KERN_STACK_SIZE)); | 136 NACL_KERN_STACK_SIZE)); |
| 137 | 137 |
| 138 NaClChromeMainStart(args); | 138 struct NaClApp *nap = NaClAppCreate(); |
|
dmichael (off chromium)
2014/01/16 21:30:26
Here too... can you just do it on the stack?
| |
| 139 NaClChromeMainStartApp(nap, args); | |
| 139 NaClLog(LOG_FATAL, "NaClChromeMainStart() should never return\n"); | 140 NaClLog(LOG_FATAL, "NaClChromeMainStart() should never return\n"); |
| 140 return 1; | 141 return 1; |
| 141 } | 142 } |
| OLD | NEW |
