Add a NaCl-Private interface for opening files in DIR_PNACL_COMPONENT.

chrome/renderer/pepper/ppb_nacl_private_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/pepper/ppb_nacl_private_impl.h"
 
 #ifndef DISABLE_NACL
 
+#if defined(OS_WIN)
+#include <fcntl.h>
+#include <io.h>
+#endif
+
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/sandbox_init.h"
@@ skipping 16 matching lines @@
 
 using content::RenderThread;
 using content::RenderView;
 using webkit::ppapi::HostGlobals;
 using webkit::ppapi::PluginInstance;
 using webkit::ppapi::PluginDelegate;
 using WebKit::WebView;
 
 namespace {
 
+// This allows us to send requests from background threads.
+// E.g., to do LaunchSelLdr for helper nexes (which is done synchronously),
+// in a background thread, to avoid jank.
 base::LazyInstance<scoped_refptr<IPC::SyncMessageFilter> >
     g_background_thread_sender = LAZY_INSTANCE_INITIALIZER;
 
 typedef std::map<PP_Instance, IPC::ChannelHandle> ChannelHandleMap;
 
 base::LazyInstance<ChannelHandleMap> g_channel_handle_map =
     LAZY_INSTANCE_INITIALIZER;
 
 // Launch NaCl's sel_ldr process.
 PP_Bool LaunchSelLdr(PP_Instance instance,
@@ skipping 195 matching lines @@
                           unsigned int options) {
 #if defined(OS_WIN)
   return content::BrokerDuplicateHandle(source_handle, process_id,
                                         target_handle, desired_access,
                                         options);
 #else
   return 0;
 #endif
 }
 
+int GetReadonlyPnaclFD(const char* filename) {
+  IPC::PlatformFileForTransit out_fd = IPC::InvalidPlatformFileForTransit();
+  IPC::Sender* sender = content::RenderThread::Get();
+  if (sender == NULL)
+    sender = g_background_thread_sender.Pointer()->get();
+
+  if (!sender->Send(new ChromeViewHostMsg_GetReadonlyPnaclFD(
+          std::string(filename),
+          &out_fd))) {
+    return -1;
+  }
+
+  if (out_fd == IPC::InvalidPlatformFileForTransit()) {
+    return -1;
+  }
+
+  base::PlatformFile handle = IPC::PlatformFileForTransitToPlatformFile(

[brettw, 2012/07/23 18:09:02]

Random suggestion: I'd find this easier to read if you broke the line after the
= instead (to keep the arg with the function name).

[jvoung (off chromium), 2012/07/23 19:59:04]

Ah, yes -- Done.

+      out_fd);
+#if defined(OS_WIN)
+  int posix_desc = _open_osfhandle(reinterpret_cast<intptr_t>(handle),
+                                   _O_RDONLY | _O_BINARY);
+  if (posix_desc == -1) {
+    // Close the Windows HANDLE if it can't be converted.
+    CloseHandle(handle);
+    return -1;
+  }
+  return posix_desc;
+#elif defined(OS_POSIX)
+  return handle;
+#else
+#error "GetReadonlyPnaclFD: Don't know how to convert FileDescriptor to native."
+#endif
+}
+
 const PPB_NaCl_Private nacl_interface = {
   &LaunchSelLdr,
   &StartPpapiProxy,
   &UrandomFD,
   &Are3DInterfacesDisabled,
   &EnableBackgroundSelLdrLaunch,
   &BrokerDuplicateHandle,
+  &GetReadonlyPnaclFD
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* PPB_NaCl_Private_Impl::GetInterface() {
   return &nacl_interface;
 }
 
 #endif  // DISABLE_NACL