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

Unified Diff: components/nacl/loader/nacl_listener.cc

Issue 337463002: Remove LoadModule SRPC for non-SFI mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/nacl/common/nacl_types.cc ('k') | components/nacl/loader/nonsfi/nonsfi_main.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/loader/nacl_listener.cc
diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc
index f5c282ae461f8dd87aef5f5cbbc7e8eeb68cbb0b..9658ab53983063af92ed587b9b7c4d0a2a8ddcb9 100644
--- a/components/nacl/loader/nacl_listener.cc
+++ b/components/nacl/loader/nacl_listener.cc
@@ -36,6 +36,8 @@
#include "components/nacl/loader/nonsfi/irt_random.h"
#include "components/nacl/loader/nonsfi/nonsfi_main.h"
#include "content/public/common/child_process_sandbox_support_linux.h"
+#include "native_client/src/trusted/desc/nacl_desc_io.h"
+#include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
#include "ppapi/nacl_irt/plugin_startup.h"
#endif
@@ -468,9 +470,15 @@ void NaClListener::StartNonSfi(const nacl::NaClStartParams& params) {
CHECK(params.debug_stub_server_bound_socket.fd == -1);
CHECK(!params.uses_irt);
+ // TODO(hidehiko): Currently imc bootstrap handle is still sent to the
+ // plugin. Get rid of this.
CHECK(params.handles.size() == 1);
- int imc_bootstrap_handle = nacl::ToNativeHandle(params.handles[0]);
- nacl::nonsfi::MainStart(imc_bootstrap_handle);
+
+ CHECK(params.nexe_file != IPC::InvalidPlatformFileForTransit());
+ nacl::nonsfi::MainStart(
+ NaClDescIoDescFromDescAllocCtor(
+ IPC::PlatformFileForTransitToPlatformFile(params.nexe_file),
+ NACL_ABI_O_RDONLY));
#endif // defined(OS_LINUX)
}
« no previous file with comments | « components/nacl/common/nacl_types.cc ('k') | components/nacl/loader/nonsfi/nonsfi_main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698