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

Side by Side Diff: ppapi/nacl_irt/irt_start.cc

Issue 2025763002: Use ChannelMojo in Pepper and NaCl processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-utility-channel-mojo
Patch Set: iujbhirtughfbnjrthiubj Created 4 years, 6 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
« no previous file with comments | « mojo/edk/system/channel_nacl.cc ('k') | ppapi/nacl_irt/plugin_startup.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 // We need nacl_irt_start injection in SFI mode. Non-SFI has a different 7 // We need nacl_irt_start injection in SFI mode. Non-SFI has a different
8 // start up procedure so we just exclude it. 8 // start up procedure so we just exclude it.
9 #if defined(OS_NACL_SFI) 9 #if defined(OS_NACL_SFI)
10 10
11 #include <stdint.h> 11 #include <stdint.h>
12 12
13 #include "base/at_exit.h" 13 #include "base/at_exit.h"
14 #include "native_client/src/public/chrome_main.h" 14 #include "native_client/src/public/chrome_main.h"
15 #include "native_client/src/public/irt_core.h" 15 #include "native_client/src/public/irt_core.h"
16 #include "ppapi/nacl_irt/irt_interfaces.h" 16 #include "ppapi/nacl_irt/irt_interfaces.h"
17 #include "ppapi/nacl_irt/plugin_startup.h" 17 #include "ppapi/nacl_irt/plugin_startup.h"
18 18
19 void nacl_irt_start(uint32_t* info) { 19 void nacl_irt_start(uint32_t* info) {
20 nacl_irt_init(info); 20 nacl_irt_init(info);
21 21
22 // Though it isn't referenced here, we must instantiate an AtExitManager. 22 // Though it isn't referenced here, we must instantiate an AtExitManager.
23 base::AtExitManager exit_manager; 23 base::AtExitManager exit_manager;
24 24
25 // In SFI mode, the FDs of IPC channels are NACL_CHROME_DESC_BASE and its 25 // In SFI mode, the FDs of IPC channels are NACL_CHROME_DESC_BASE and its
26 // successor, which is set in nacl_listener.cc. 26 // successor, which is set in nacl_listener.cc.
27 ppapi::SetIPCFileDescriptors( 27 ppapi::SetIPCFileDescriptors(
28 NACL_CHROME_DESC_BASE, 28 NACL_CHROME_DESC_BASE,
29 NACL_CHROME_DESC_BASE + 1, 29 NACL_CHROME_DESC_BASE + 1,
30 NACL_CHROME_DESC_BASE + 2); 30 NACL_CHROME_DESC_BASE + 2,
31 NACL_CHROME_DESC_BASE + 3);
31 ppapi::StartUpPlugin(); 32 ppapi::StartUpPlugin();
32 33
33 nacl_irt_enter_user_code(info, chrome_irt_query); 34 nacl_irt_enter_user_code(info, chrome_irt_query);
34 } 35 }
35 36
36 #endif // defined(OS_NACL_SFI) 37 #endif // defined(OS_NACL_SFI)
OLDNEW
« no previous file with comments | « mojo/edk/system/channel_nacl.cc ('k') | ppapi/nacl_irt/plugin_startup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698