diff options
4 files changed, 8 insertions, 39 deletions
diff --git a/chrome/renderer/pepper/ppb_nacl_private_impl.cc b/chrome/renderer/pepper/ppb_nacl_private_impl.cc index 00b4f14..374115b 100644 --- a/chrome/renderer/pepper/ppb_nacl_private_impl.cc +++ b/chrome/renderer/pepper/ppb_nacl_private_impl.cc @@ -29,8 +29,7 @@ base::LazyInstance<scoped_refptr<IPC::SyncMessageFilter> > // Launch NaCl's sel_ldr process. bool LaunchSelLdr(const char* alleged_url, int socket_count, - void* imc_handles, void* nacl_process_handle, - int* nacl_process_id) { + void* imc_handles) { std::vector<nacl::FileDescriptor> sockets; IPC::Message::Sender* sender = content::RenderThread::Get(); if (sender == NULL) @@ -45,11 +44,6 @@ bool LaunchSelLdr(const char* alleged_url, int socket_count, static_cast<nacl::Handle*>(imc_handles)[i] = nacl::ToNativeHandle(sockets[i]); } - // TODO(mseaborn): Remove the arguments nacl_process_handle and - // nacl_process_id from the interface. - *reinterpret_cast<base::ProcessHandle*>(nacl_process_handle) = - (base::ProcessHandle) -1; - *nacl_process_id = 0; return true; } diff --git a/ppapi/c/private/ppb_nacl_private.h b/ppapi/c/private/ppb_nacl_private.h index 939f37f..1dcc9ee 100644 --- a/ppapi/c/private/ppb_nacl_private.h +++ b/ppapi/c/private/ppb_nacl_private.h @@ -8,19 +8,16 @@ #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_stdint.h" -#define PPB_NACL_PRIVATE_INTERFACE "PPB_NaCl(Private);0.3" +#define PPB_NACL_PRIVATE_INTERFACE "PPB_NaCl(Private);0.4" struct PPB_NaCl_Private { // This function launches NaCl's sel_ldr process. On success, the function // returns true, otherwise it returns false. When it returns true, it will - // write |socket_count| nacl::Handles to imc_handles and will write the - // nacl::Handle of the created process to |nacl_process_handle|. Finally, - // the function will write the process ID of the created process to - // |nacl_process_id|. Unless EnableBackgroundSelLdrLaunch is called, this - // method must be invoked from the main thread. + // write |socket_count| nacl::Handles to imc_handles. Unless + // EnableBackgroundSelLdrLaunch is called, this method must be invoked from + // the main thread. bool (*LaunchSelLdr)(const char* alleged_url, int socket_count, - void* imc_handles, void* nacl_process_handle, - int* nacl_process_id); + void* imc_handles); // On POSIX systems, this function returns the file descriptor of // /dev/urandom. On non-POSIX systems, this function returns 0. diff --git a/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h b/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h index 6ba93fe..7c60ad8 100644 --- a/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h +++ b/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h @@ -17,9 +17,7 @@ typedef bool (*LaunchNaClProcessFunc)(const char* url, int socket_count, - nacl::Handle* result_sockets, - nacl::Handle* nacl_process_handle, - int* nacl_process_id); + nacl::Handle* result_sockets); typedef int (*GetURandomFDFunc)(void); diff --git a/ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc b/ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc index f5b6c9f..c32209b 100644 --- a/ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc +++ b/ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc @@ -6,38 +6,18 @@ #include "native_client/src/trusted/plugin/nacl_entry_points.h" -#if NACL_WINDOWS -# include <windows.h> -#endif - LaunchNaClProcessFunc launch_nacl_process = NULL; namespace plugin { bool SelLdrLauncherChrome::Start(const char* url) { // send a synchronous message to the browser process - // TODO(mseaborn): Remove the nacl_proc_handle and nacl_proc_id - // arguments. Chromium is being changed not to give the renderer - // the Windows handle of the NaCl process. - nacl::Handle nacl_proc_handle; - int nacl_proc_id; // TODO(sehr): This is asserted to be one. Remove this parameter. static const int kNumberOfChannelsToBeCreated = 1; if (!launch_nacl_process || - !launch_nacl_process(url, - kNumberOfChannelsToBeCreated, - &channel_, - &nacl_proc_handle, - &nacl_proc_id)) { + !launch_nacl_process(url, kNumberOfChannelsToBeCreated, &channel_)) { return false; } - -#if NACL_WINDOWS - if (nacl_proc_handle != nacl::kInvalidHandle && - nacl_proc_handle != NULL) { - CloseHandle(nacl_proc_handle); - } -#endif return true; } |