ppapi/nacl_irt/irt_start.cc - Issue 2081183005: Use ChannelMojo from the browser to NaCl loader process.

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

Issue 2081183005: Use ChannelMojo from the browser to NaCl loader process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-ipc-channel-handle

Patch Set: rebase Created 4 years, 5 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

« content/zygote/zygote_linux.cc ('K') | « content/zygote/zygote_linux.cc ('k') | ppapi/nacl_irt/plugin_startup.h » ('j') | no next file with comments »

OLD	NEW
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

(...skipping 10 matching lines...) Expand all Loading...
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 ppapi::StartUpPlugin();	31 ppapi::StartUpPlugin(true);
	Mark Seaborn 2016/07/08 18:22:25 Instead of parameterising whether ppapi::StartUpPl Instead of parameterising whether ppapi::StartUpPlugin() calls mojo::edk::Init(), how about just calling mojo::edk::Init() here? That would be clearer. Anand Mistry (off Chromium) 2016/07/12 07:26:23 It's not in this CL because it's not necessary yet Show quoted text On 2016/07/08 18:22:25, Mark Seaborn wrote: > Instead of parameterising whether ppapi::StartUpPlugin() calls > mojo::edk::Init(), how about just calling mojo::edk::Init() here? That would be > clearer. It's not in this CL because it's not necessary yet, but there's more to this than just calling mojo::edk::Init(). We also need to initialize Mojo's internal task runner using the IO thread created by StartUpPlugin(). But that's for a follow-up. Mark Seaborn 2016/09/01 18:43:31 I see. I'd still prefer if you didn't parameteris Show quoted text On 2016/07/12 07:26:23, Anand Mistry (off Chromium) wrote: > On 2016/07/08 18:22:25, Mark Seaborn wrote: > > Instead of parameterising whether ppapi::StartUpPlugin() calls > > mojo::edk::Init(), how about just calling mojo::edk::Init() here? That would > be > > clearer. > > It's not in this CL because it's not necessary yet, but there's more to this > than just calling mojo::edk::Init(). We also need to initialize Mojo's internal > task runner using the IO thread created by StartUpPlugin(). But that's for a > follow-up. I see. I'd still prefer if you didn't parameterise this function in this CL. Would you mind keeping the code simpler/clearer for now, and leave the extra complexity for later changes when it becomes necessary? Sam McNally 2016/09/02 04:42:10 Done in https://codereview.chromium.org/2305913002 Show quoted text On 2016/09/01 18:43:31, Mark Seaborn wrote: > On 2016/07/12 07:26:23, Anand Mistry (off Chromium) wrote: > > On 2016/07/08 18:22:25, Mark Seaborn wrote: > > > Instead of parameterising whether ppapi::StartUpPlugin() calls > > > mojo::edk::Init(), how about just calling mojo::edk::Init() here? That > would > > be > > > clearer. > > > > It's not in this CL because it's not necessary yet, but there's more to this > > than just calling mojo::edk::Init(). We also need to initialize Mojo's > internal > > task runner using the IO thread created by StartUpPlugin(). But that's for a > > follow-up. > > I see. I'd still prefer if you didn't parameterise this function in this CL. > Would you mind keeping the code simpler/clearer for now, and leave the extra > complexity for later changes when it becomes necessary? Done in https://codereview.chromium.org/2305913002/.
32	32

33 nacl_irt_enter_user_code(info, chrome_irt_query);	33 nacl_irt_enter_user_code(info, chrome_irt_query);

34 }	34 }

35	35

36 #endif // defined(OS_NACL_SFI)	36 #endif // defined(OS_NACL_SFI)

OLD	NEW