Notify CloseFile from Pepper to FileSystem.

content/renderer/pepper/pepper_plugin_delegate_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 "content/renderer/pepper/pepper_plugin_delegate_impl.h"
 
 #include <cmath>
 #include <cstddef>
 #include <map>
 #include <queue>
@@ skipping 837 matching lines @@
 }
 
 void PepperPluginDelegateImpl::DidUpdateFile(const GURL& path, int64_t delta) {
   ChildThread::current()->Send(new FileSystemHostMsg_DidUpdate(path, delta));
 }
 
 class AsyncOpenFileSystemURLCallbackTranslator
     : public fileapi::FileSystemCallbackDispatcher {
  public:
   AsyncOpenFileSystemURLCallbackTranslator(
-      const webkit::ppapi::PluginDelegate::AsyncOpenFileCallback& callback)
-    : callback_(callback) {
+      const webkit::ppapi::PluginDelegate::AsyncOpenFileSystemURLCallback&
+          callback,
+      const webkit::ppapi::PluginDelegate::NotifyCloseFileCallback&
+          close_file_callback)
+    : callback_(callback),
+      close_file_callback_(close_file_callback) {
   }
 
   virtual ~AsyncOpenFileSystemURLCallbackTranslator() {}
 
   virtual void DidSucceed() {
     NOTREACHED();
   }
   virtual void DidReadMetadata(
       const base::PlatformFileInfo& file_info,
       const FilePath& platform_path) {
     NOTREACHED();
   }
   virtual void DidReadDirectory(
       const std::vector<base::FileUtilProxy::Entry>& entries,
       bool has_more) {
     NOTREACHED();
   }
   virtual void DidOpenFileSystem(const std::string& name,
                                  const GURL& root) {
     NOTREACHED();
   }
 
   virtual void DidFail(base::PlatformFileError error_code) {
     base::PlatformFile invalid_file = base::kInvalidPlatformFileValue;
-    callback_.Run(error_code, base::PassPlatformFile(&invalid_file));
+    callback_.Run(error_code,
+                  base::PassPlatformFile(&invalid_file),
+                  close_file_callback_);

[yzshen1, 2012/06/29 17:15:52]

[optional] Is it better to pass a no-op as the third parameter in this case?

[kinaba, 2012/07/03 06:46:35]

Done.

   }
 
   virtual void DidWrite(int64 bytes, bool complete) {
     NOTREACHED();
   }
 
   virtual void DidOpenFile(
       base::PlatformFile file) {
-    callback_.Run(base::PLATFORM_FILE_OK, base::PassPlatformFile(&file));
+    callback_.Run(base::PLATFORM_FILE_OK,
+                  base::PassPlatformFile(&file),
+                  close_file_callback_);
     // Make sure we won't leak file handle if the requester has died.
     if (file != base::kInvalidPlatformFileValue) {
       base::FileUtilProxy::Close(
           RenderThreadImpl::current()->GetFileThreadMessageLoopProxy(), file,
-          base::FileUtilProxy::StatusCallback());
+          close_file_callback_);
     }
   }
 
-private:  // TODO(ericu): Delete this?
-  webkit::ppapi::PluginDelegate::AsyncOpenFileCallback callback_;
+ private:
+  webkit::ppapi::PluginDelegate::AsyncOpenFileSystemURLCallback callback_;
+  webkit::ppapi::PluginDelegate::NotifyCloseFileCallback close_file_callback_;
 };
 
 bool PepperPluginDelegateImpl::AsyncOpenFileSystemURL(
-    const GURL& path, int flags, const AsyncOpenFileCallback& callback) {
+    const GURL& path,
+    int flags,
+    const AsyncOpenFileSystemURLCallback& callback) {
 
   FileSystemDispatcher* file_system_dispatcher =
       ChildThread::current()->file_system_dispatcher();
   return file_system_dispatcher->OpenFile(path, flags,
-      new AsyncOpenFileSystemURLCallbackTranslator(callback));
+      new AsyncOpenFileSystemURLCallbackTranslator(
+          callback,
+          base::Bind(&PepperPluginDelegateImpl::DoNotifyCloseFile,
+                              AsWeakPtr(),
+                              path)));

[dmichael (off chromium), 2012/06/29 16:06:40]

nit: indentation is off

[kinaba, 2012/07/03 06:46:35]

Done.

+}
+
+void PepperPluginDelegateImpl::DoNotifyCloseFile(

[yzshen1, 2012/06/29 17:15:52]

- please keep the definitions in the same order as the declarations in the .h
file.
- this could be a static method, right? (Then you don't need to use AsWeakPtr()
on line 926.) Or is this intended?

[kinaba, 2012/07/03 06:46:35]

Good point, I haven't realized.
Moved the function (and the Dispatcher class) to the anonymous namespace on top
of this file.

+    const GURL& path,
+    base::PlatformFileError /* unused */) {
+  ChildThread::current()->file_system_dispatcher()->NotifyCloseFile(path);
 }
 
 base::PlatformFileError PepperPluginDelegateImpl::OpenFile(
     const ppapi::PepperFilePath& path,
     int flags,
     base::PlatformFile* file) {
   IPC::PlatformFileForTransit transit_file;
   base::PlatformFileError error;
   IPC::Message* msg = new PepperFileMsg_OpenFile(
       path, flags, &error, &transit_file);
@@ skipping 782 matching lines @@
   else
     return render_view_->mouse_lock_dispatcher();
 }
 
 webkit_glue::ClipboardClient*
     PepperPluginDelegateImpl::CreateClipboardClient() const {
   return new RendererClipboardClient;
 }
 
 }  // namespace content