Pepper: Move FileRef to the "new" resource proxy.

content/renderer/pepper/pepper_file_io_host.cc

Index: content/renderer/pepper/pepper_file_io_host.cc
diff --git a/content/renderer/pepper/pepper_file_io_host.cc b/content/renderer/pepper/pepper_file_io_host.cc
index 5a6d40ce5c9193ad6aeec494bc0ee45217bcaed6..0565f34b67780bce36cd8b25062a6c91e14e7707 100644
--- a/content/renderer/pepper/pepper_file_io_host.cc
+++ b/content/renderer/pepper/pepper_file_io_host.cc
@@ -17,9 +17,11 @@
 #include "content/public/common/content_client.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/pepper/host_globals.h"
+#include "content/renderer/pepper/pepper_browser_connection.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
-#include "content/renderer/pepper/ppb_file_ref_impl.h"
+#include "content/renderer/pepper/plugin_module.h"
 #include "content/renderer/pepper/quota_file_io.h"
+#include "content/renderer/pepper/renderer_ppapi_host_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/dispatch_host_message.h"
@@ -36,7 +38,6 @@ using ppapi::FileIOStateManager;
 using ppapi::PPTimeToTime;
 using ppapi::host::ReplyMessageContext;
 using ppapi::thunk::EnterResourceNoLock;
-using ppapi::thunk::PPB_FileRef_API;
 
 namespace {
 
@@ -138,10 +139,12 @@ void DidFailOpenFileSystemURL(const AsyncOpenFileSystemURLCallback& callback,
 
 }  // namespace
 
-PepperFileIOHost::PepperFileIOHost(RendererPpapiHost* host,
+PepperFileIOHost::PepperFileIOHost(RendererPpapiHostImpl* host,
                                    PP_Instance instance,
                                    PP_Resource resource)
     : ResourceHost(host->GetPpapiHost(), instance, resource),
+      host_(host),
+      plugin_instance_(HostGlobals::Get()->GetInstance(instance)),
       file_(base::kInvalidPlatformFileValue),
       file_system_type_(PP_FILESYSTEMTYPE_INVALID),
       quota_policy_(quota::kQuotaLimitTypeUnknown),
@@ -238,46 +241,67 @@ int32_t PepperFileIOHost::OnHostMsgOpen(
     return PP_ERROR_BADARGUMENT;
   }
 
-  EnterResourceNoLock<PPB_FileRef_API> enter(file_ref_resource, true);
-  if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
+  RenderView* render_view = host_->GetRenderViewForInstance(pp_instance());
+  PepperBrowserConnection* browser_connection =
+      PepperBrowserConnection::Get(render_view);
+  int child_process_id = plugin_instance_->module()->GetPluginChildId();
+
+  // Explicitly set child_process_id to 0 if we're running in process. This is
+  // necessary in the case where we're a host for a resource in a trusted

[dmichael (off chromium), 2013/08/08 21:24:03]

s/"a trusted plugin"/"the trusted NaCl plugin"
i.e., this doesn't apply to just any trusted plugin, right?

[teravest, 2013/08/09 02:00:08]

Done.

+  // plugin. In that case, we may have already done work for the untrusted
+  // plugin, and the call above will give a non-zero child_process_id.
+  if (host_->IsRunningInProcess())
+    child_process_id = 0;

[dmichael (off chromium), 2013/08/08 21:24:03]

optional suggestion: If you have to do this in very many places, you could make
a convenience function somewhere (the HostImpl?) that does this:
void RendererPpapiHostImpl::AdjustChildProcessId(&child_process_id) {
  if (IsRunningInProcess())
    *child_process_id = 0;
}
...the main purpose of which would be to have 1 place to stick the big fat
comment.

+
+  std::vector<PP_Resource> resources;
+  resources.push_back(file_ref_resource);
+  browser_connection->SendBrowserFileRefGetInfo(
+      child_process_id,
+      resources,
+      base::Bind(&PepperFileIOHost::DidGetFileRefInfo,
+                 weak_factory_.GetWeakPtr(),
+                 context->MakeReplyMessageContext(),
+                 platform_file_flags));
+  state_manager_.SetPendingOperation(FileIOStateManager::OPERATION_EXCLUSIVE);
+  return PP_OK_COMPLETIONPENDING;
+}
 
-  PPB_FileRef_API* file_ref_api = enter.object();
-  PP_FileSystemType type = file_ref_api->GetFileSystemType();
-  if (type != PP_FILESYSTEMTYPE_LOCALPERSISTENT &&
-      type != PP_FILESYSTEMTYPE_LOCALTEMPORARY &&
-      type != PP_FILESYSTEMTYPE_EXTERNAL &&
-      type != PP_FILESYSTEMTYPE_ISOLATED)
-    return PP_ERROR_FAILED;
-  file_system_type_ = type;
+void PepperFileIOHost::DidGetFileRefInfo(
+    ppapi::host::ReplyMessageContext reply_context,
+    int platform_file_flags,
+    const std::vector<ppapi::FileRefDetailedInfo>& infos) {
+  if (infos.size() != 1) {
+    reply_context.params.set_result(PP_ERROR_FAILED);
+    host()->SendReply(reply_context,
+                      PpapiPluginMsg_FileIO_OpenReply());
+    return;
+  }
 
-  PPB_FileRef_Impl* file_ref = static_cast<PPB_FileRef_Impl*>(file_ref_api);
-  if (file_ref->HasValidFileSystem()) {
-    file_system_url_ = file_ref->GetFileSystemURL();
+  PP_FileSystemType type = infos[0].file_system_type;

[yzshen1, 2013/08/08 23:16:21]

Maybe directly assign to file_system_type_?

[teravest, 2013/08/09 02:00:08]

Done.

+  file_system_type_ = type;
+  if (type != PP_FILESYSTEMTYPE_EXTERNAL) {
+    const std::string& file_system_url_spec = infos[0].file_system_url_spec;

[yzshen1, 2013/08/08 23:16:21]

nit: Maybe merge line 283 and 284?

[teravest, 2013/08/09 02:00:08]

Done.

+    file_system_url_ = GURL(file_system_url_spec);
 
     FileSystemDispatcher* file_system_dispatcher =
         ChildThread::current()->file_system_dispatcher();
+
     AsyncOpenFileSystemURLCallback callback = base::Bind(
         &PepperFileIOHost::ExecutePlatformOpenFileSystemURLCallback,
         weak_factory_.GetWeakPtr(),
-        context->MakeReplyMessageContext());
+        reply_context);
     file_system_dispatcher->OpenFile(
         file_system_url_, platform_file_flags,
         base::Bind(&DidOpenFileSystemURL, callback),
         base::Bind(&DidFailOpenFileSystemURL, callback));
   } else {
-    if (file_system_type_ != PP_FILESYSTEMTYPE_EXTERNAL)
-      return PP_ERROR_FAILED;
     int message_id = pending_async_open_files_.Add(new AsyncOpenFileCallback(
         base::Bind(&PepperFileIOHost::ExecutePlatformOpenFileCallback,
                     weak_factory_.GetWeakPtr(),
-                    context->MakeReplyMessageContext())));
+                    reply_context)));
     RenderThreadImpl::current()->Send(new ViewHostMsg_AsyncOpenPepperFile(
-        routing_id_, file_ref->GetSystemPath(), open_flags, message_id));
+        routing_id_, infos[0].external_path, open_flags_, message_id));
   }
-
-  state_manager_.SetPendingOperation(FileIOStateManager::OPERATION_EXCLUSIVE);
-  return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PepperFileIOHost::OnHostMsgQuery(