Refactor FileIO to the new design

content/renderer/pepper/pepper_file_io_host.h

Index: content/renderer/pepper/pepper_file_io_host.h
diff --git a/content/renderer/pepper/pepper_file_io_host.h b/content/renderer/pepper/pepper_file_io_host.h
new file mode 100644
index 0000000000000000000000000000000000000000..4f919ef81b75426a349b0d86facc983c6c903249
--- /dev/null
+++ b/content/renderer/pepper/pepper_file_io_host.h
@@ -0,0 +1,149 @@
+// 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.
+
+#ifndef CONTENT_RENDERER_PEPPER_PEPPER_FILE_IO_HOST_H_
+#define CONTENT_RENDERER_PEPPER_PEPPER_FILE_IO_HOST_H_
+
+#include <string>
+
+#include "base/basictypes.h"
+#include "base/memory/weak_ptr.h"
+#include "content/public/renderer/renderer_ppapi_host.h"
+#include "ppapi/host/host_message_context.h"
+#include "ppapi/host/resource_host.h"
+#include "ppapi/shared_impl/ppb_file_io_shared.h"
+#include "ppapi/thunk/ppb_file_ref_api.h"
+#include "webkit/plugins/ppapi/plugin_delegate.h"
+
+using ppapi::host::ReplyMessageContext;
+using webkit::ppapi::PluginDelegate;
+
+namespace webkit {
+namespace ppapi {
+class QuotaFileIO;
+}  // namespace ppapi
+}  // namespace webkit
+
+namespace content {
+
+class PepperFileIOHost : public ppapi::host::ResourceHost,
+                         public ppapi::PPB_FileIO_Shared,

[raymes, 2012/11/28 18:39:35]

We want to remove this as a base class. I think it can just be a helper class.

[victorhsieh, 2012/11/29 06:34:55]

Done.

+                         public base::SupportsWeakPtr<PepperFileIOHost> {
+ public:
+  PepperFileIOHost(RendererPpapiHost* host,
+                   PP_Instance instance,
+                   PP_Resource resource);
+  virtual ~PepperFileIOHost();
+
+  // ppapi::host::ResourceHost override.
+  virtual int32_t OnResourceMessageReceived(
+      const IPC::Message& msg,
+      ppapi::host::HostMessageContext* context) OVERRIDE;
+
+ private:
+  int32_t OnHostMsgOpen(ppapi::host::HostMessageContext* context,
+                        PP_Resource file_ref_resource,
+                        int32_t open_flags);
+  int32_t OnHostMsgQuery(ppapi::host::HostMessageContext* context);
+  int32_t OnHostMsgTouch(ppapi::host::HostMessageContext* context,
+                         PP_Time last_access_time,
+                         PP_Time last_modified_time);
+  int32_t OnHostMsgRead(ppapi::host::HostMessageContext* context,
+                        int64_t offset,
+                        int32_t bytes_to_read);
+  int32_t OnHostMsgWrite(ppapi::host::HostMessageContext* context,
+                         int64_t offset,
+                         const std::string& buffer);
+  int32_t OnHostMsgSetLength(ppapi::host::HostMessageContext* context,
+                             int64_t length);
+  int32_t OnHostMsgClose(ppapi::host::HostMessageContext* context);
+  int32_t OnHostMsgFlush(ppapi::host::HostMessageContext* context);
+  // Trusted API.
+  int32_t OnHostMsgGetOSFileDescriptor(
+      ppapi::host::HostMessageContext* context);
+  int32_t OnHostMsgWillWrite(ppapi::host::HostMessageContext* context,
+                             int64_t offset,
+                             int32_t bytes_to_write);
+  int32_t OnHostMsgWillSetLength(ppapi::host::HostMessageContext* context,
+                                 int64_t length);
+
+  int32_t OpenValidated(const ReplyMessageContext& reply_context,

[raymes, 2012/11/28 18:39:35]

We want to remove these "validated" functions

[victorhsieh, 2012/11/29 06:34:55]

Done.

+                        ppapi::thunk::PPB_FileRef_API* file_ref_api,
+                        int32_t open_flags);
+  int32_t QueryValidated(const ReplyMessageContext&);
+  int32_t TouchValidated(const ReplyMessageContext& reply_context,
+                         PP_Time last_access_time,
+                         PP_Time last_modified_time);
+  int32_t ReadValidated(const ReplyMessageContext& reply_context,
+                        int64_t offset,
+                        int32_t bytes_to_read);
+  int32_t WriteValidated(const ReplyMessageContext& reply_context,
+                         int64_t offset,
+                         const char* buffer,
+                         int32_t bytes_to_write);
+  int32_t SetLengthValidated(const ReplyMessageContext& reply_context,
+                             int64_t length);
+  int32_t FlushValidated(const ReplyMessageContext& reply_context);
+
+  // Callback handlers. These mostly convert the PlatformFileError to the
+  // PP_Error code and send back the reply.  Note that the argument
+  // ReplyMessageContext is copied so that we have a closure containing all
+  // necessary information to reply.
+  void ExecutePlatformGeneralCallback(

[raymes, 2012/11/29 00:50:58]

We should be able to fit the first argument on the previous line.

[victorhsieh, 2012/11/29 06:34:55]

Done.

+      ReplyMessageContext reply_context,
+      base::PlatformFileError error_code);
+  void ExecutePlatformOpenFileCallback(
+      ReplyMessageContext reply_context,
+      base::PlatformFileError error_code,
+      base::PassPlatformFile file);
+  void ExecutePlatformOpenFileSystemURLCallback(
+      ReplyMessageContext reply_context,
+      base::PlatformFileError error_code,
+      base::PassPlatformFile file,
+      const PluginDelegate::NotifyCloseFileCallback& callback);
+  void ExecutePlatformQueryCallback(
+      ReplyMessageContext reply_context,
+      base::PlatformFileError error_code,
+      const base::PlatformFileInfo& file_info);
+  void ExecutePlatformReadCallback(
+      ReplyMessageContext reply_context,
+      base::PlatformFileError error_code,
+      const char* data, int bytes_read);
+  void ExecutePlatformWriteCallback(
+      ReplyMessageContext reply_context,
+      base::PlatformFileError error_code,
+      int bytes_written);
+  void ExecutePlatformWillWriteCallback(
+      ReplyMessageContext reply_context,
+      base::PlatformFileError error_code,
+      int bytes_written);
+
+  // TODO(victorhsieh): eliminate plugin_delegate_ as it's no longer needed.
+  webkit::ppapi::PluginDelegate* plugin_delegate_;  // Not owned.
+
+  base::PlatformFile file_;
+
+  // The file system type specified in the Open() call. This will be
+  // PP_FILESYSTEMTYPE_INVALID before open was called. This value does not
+  // indicate that the open command actually succeeded.
+  PP_FileSystemType file_system_type_;
+
+  // Valid only for PP_FILESYSTEMTYPE_LOCAL{PERSISTENT,TEMPORARY}.
+  GURL file_system_url_;
+
+  // Callback function for notifying when the file handle is closed.
+  PluginDelegate::NotifyCloseFileCallback notify_close_file_callback_;
+
+  // Pointer to a QuotaFileIO instance, which is valid only while a file
+  // of type PP_FILESYSTEMTYPE_LOCAL{PERSISTENT,TEMPORARY} is opened.
+  scoped_ptr<webkit::ppapi::QuotaFileIO> quota_file_io_;
+
+  base::WeakPtrFactory<PepperFileIOHost> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(PepperFileIOHost);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_RENDERER_PEPPER_PEPPER_FILE_IO_HOST_H_