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::AsyncOpenFileCallback& callback,
+      const base::FileUtilProxy::StatusCallback& 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) {
@@ skipping 18 matching lines @@
     NOTREACHED();
   }
 
   virtual void DidOpenFile(
       base::PlatformFile file) {
     callback_.Run(base::PLATFORM_FILE_OK, base::PassPlatformFile(&file));
     // 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?

[kinuko, 2012/06/26 11:13:36]

nit: can you delete this comment (and fix indent) while you're there?

[kinaba, 2012/06/27 03:47:42]

Done.

   webkit::ppapi::PluginDelegate::AsyncOpenFileCallback callback_;
+  base::FileUtilProxy::StatusCallback close_file_callback_;
 };
 
 bool PepperPluginDelegateImpl::AsyncOpenFileSystemURL(
     const GURL& path, int flags, const AsyncOpenFileCallback& callback) {
 
   FileSystemDispatcher* file_system_dispatcher =
       ChildThread::current()->file_system_dispatcher();
   return file_system_dispatcher->OpenFile(path, flags,
-      new AsyncOpenFileSystemURLCallbackTranslator(callback));
+      new AsyncOpenFileSystemURLCallbackTranslator(
+          callback, GetCloseFileSystemURLCallback(path)));
+}
+
+base::Callback<void (base::PlatformFileError)>
+PepperPluginDelegateImpl::GetCloseFileSystemURLCallback(const GURL& path) {
+  return base::Bind(&PepperPluginDelegateImpl::DoNotifyCloseFile,
+                    AsWeakPtr(),
+                    path);
+}
+
+void PepperPluginDelegateImpl::DoNotifyCloseFile(
+    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