Implement open_resource in non-SFI mode.

components/nacl/renderer/ppb_nacl_private_impl.cc

 // Copyright 2013 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 "components/nacl/renderer/ppb_nacl_private_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/containers/scoped_ptr_hash_map.h"
@@ skipping 136 matching lines @@
   }
 
  private:
   int num_remaining_calls_;
   PP_CompletionCallback callback_;
   int32_t result_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelConnectedCallback);
 };
 
-// Thin adapter from PP_ManifestService to ManifestServiceChannel::Delegate.
+// Thin adapter from PPP_ManifestService to ManifestServiceChannel::Delegate.
 // Note that user_data is managed by the caller of LaunchSelLdr. Please see
 // also PP_ManifestService's comment for more details about resource
 // management.
 class ManifestServiceProxy : public ManifestServiceChannel::Delegate {
  public:
-  ManifestServiceProxy(const PP_ManifestService* manifest_service,
+  ManifestServiceProxy(const PPP_ManifestService* manifest_service,
                        void* user_data)
       : manifest_service_(*manifest_service),
         user_data_(user_data) {
   }
 
   virtual ~ManifestServiceProxy() {
     Quit();
   }
 
   virtual void StartupInitializationComplete() OVERRIDE {
     if (!user_data_)
       return;
 
     if (!PP_ToBool(
             manifest_service_.StartupInitializationComplete(user_data_))) {
       user_data_ = NULL;
     }
   }
 
+  virtual void OpenResource(
+      const std::string& key,
+      const ManifestServiceChannel::OpenResourceCallback& callback) OVERRIDE {
+    if (!user_data_)
+      return;
+
+    OpenResourceCallbackData* data = new OpenResourceCallbackData(callback);
+    if (!PP_ToBool(manifest_service_.OpenResource(
+            user_data_,
+            key.c_str(),
+            &data->platform_file,

[dmichael (off chromium), 2014/04/25 21:06:58]

nit: I think parens around data->platform_file would help readability here.

[hidehiko, 2014/04/28 08:44:27]

Acknowledged.

+            PP_MakeCompletionCallback(DidOpenResource, data)))) {
+      // When failed, callback won't be invoked, so it is necessary to free
+      // the data.
+      delete data;
+      user_data_ = NULL;
+    }
+
+    // When succeeded, the callback will be called, and the data will be freed

[teravest, 2014/04/25 20:44:02]

Would it be simpler to always invoke the callback?

OpenResource could invoke the callback with PP_ERROR_ABORTED instead of
returning false. Then there are fewer paths to follow.

[hidehiko, 2014/04/28 08:44:27]

Done.

+    // in the callback.
+  }
+
  private:
+  struct OpenResourceCallbackData {
+    explicit OpenResourceCallbackData(
+        const ManifestServiceChannel::OpenResourceCallback& callback)
+        : platform_file(base::kInvalidPlatformFileValue), callback(callback) {
+    }
+
+    base::PlatformFile platform_file;
+    ManifestServiceChannel::OpenResourceCallback callback;
+  };
+
+  static void DidOpenResource(void* user_data, int32_t pp_error) {
+    scoped_ptr<OpenResourceCallbackData> data(
+        static_cast<OpenResourceCallbackData*>(user_data));
+    data->callback.Run(pp_error, data->platform_file);
+  }
+
   void Quit() {
     if (!user_data_)
       return;
 
     bool result = PP_ToBool(manifest_service_.Quit(user_data_));
     DCHECK(!result);
     user_data_ = NULL;
   }
 
-  PP_ManifestService manifest_service_;
+  PPP_ManifestService manifest_service_;
   void* user_data_;
   DISALLOW_COPY_AND_ASSIGN(ManifestServiceProxy);
 };
 
 // Launch NaCl's sel_ldr process.
 void LaunchSelLdr(PP_Instance instance,
                   const char* alleged_url,
                   PP_Bool uses_irt,
                   PP_Bool uses_ppapi,
                   PP_Bool uses_nonsfi_mode,
                   PP_Bool enable_ppapi_dev,
                   PP_Bool enable_dyncode_syscalls,
                   PP_Bool enable_exception_handling,
                   PP_Bool enable_crash_throttling,
-                  const PP_ManifestService* manifest_service_interface,
+                  const PPP_ManifestService* manifest_service_interface,
                   void* manifest_service_user_data,
                   void* imc_handle,
                   struct PP_Var* error_message,
                   PP_CompletionCallback callback) {
   CHECK(ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->
             BelongsToCurrentThread());
 
   // Create the manifest service proxy here, so on error case, it will be
   // destructed (without passing it to ManifestServiceChannel), and QUIT
   // will be called in its destructor so that the caller of this function
@@ skipping 632 matching lines @@
   &ProcessNaClManifest
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl