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 175 matching lines @@
   virtual bool HandleMouseLockedInputEvent(
       const WebKit::WebMouseEvent &event) OVERRIDE {
     plugin_->HandleMouseLockedInputEvent(event);
     return true;
   }
 
  private:
   webkit::ppapi::PluginInstance* plugin_;
 };
 
+void DoNothing() {}
+
 }  // namespace
 
 PepperPluginDelegateImpl::PepperPluginDelegateImpl(RenderViewImpl* render_view)
     : RenderViewObserver(render_view),
       render_view_(render_view),
       has_saved_context_menu_action_(false),
       saved_context_menu_action_(0),
       focused_plugin_(NULL),
       last_mouse_event_target_(NULL),
       device_enumeration_event_handler_(
@@ skipping 524 matching lines @@
     base::PlatformFile file,
     int message_id) {
   AsyncOpenFileCallback* callback =
       pending_async_open_files_.Lookup(message_id);
   DCHECK(callback);
   pending_async_open_files_.Remove(message_id);
   callback->Run(error_code, base::PassPlatformFile(&file));
   // Make sure we won't leak file handle if the requester has died.
   if (file != base::kInvalidPlatformFileValue)
     base::FileUtilProxy::Close(GetFileThreadMessageLoopProxy(), file,
                                base::FileUtilProxy::StatusCallback());

[kinuko, 2012/06/13 06:38:29]

Do we need to call NotifyCloseFile on this case?

[kinaba, 2012/06/25 11:14:02]

This method is for opening local FilePath's, not filesystem GURL's. So we don't
need to care this case.

   delete callback;
 }
 
 void PepperPluginDelegateImpl::OnSetFocus(bool has_focus) {
   for (std::set<webkit::ppapi::PluginInstance*>::iterator i =
            active_instances_.begin();
        i != active_instances_.end(); ++i)
     (*i)->SetContentAreaFocus(has_focus);
 }
 
@@ skipping 137 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());

[kinuko, 2012/06/13 06:38:29]

Ditto. Close is often called in async helper destructors like this. Do we need
to call NotifyCloseFile on these cases?

[kinaba, 2012/06/25 11:14:02]

Yes, thanks.

     }
   }
 
 private:  // TODO(ericu): Delete this?
   webkit::ppapi::PluginDelegate::AsyncOpenFileCallback 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));
 }
 
+bool PepperPluginDelegateImpl::AsyncNotifyCloseFileSystemURL(const GURL& path) {
+  // Schedule the notification task in the file thread, to make sure that the
+  // actual close operation has finished.
+  return GetFileThreadMessageLoopProxy()->PostTaskAndReply(
+      FROM_HERE,
+      base::Bind(&DoNothing),
+      base::Bind(&PepperPluginDelegateImpl::DoNotifyCloseFile,
+                 AsWeakPtr(), path));

[kinuko, 2012/06/13 06:38:29]

What happens if the plugin goes away before this is handled?

[kinaba, 2012/06/25 11:14:02]

PepperPluginDelegateImpl is associated with a renderer, so as long as renderrer
is alive, DoNotifyCloseFile() is called (no matter where plugin goes). For the
case when renderer is dead, I added a detection code to FileAPIMessageFilter.

+}
+
+void PepperPluginDelegateImpl::DoNotifyCloseFile(const GURL& path) {
+  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);
   if (!render_view_->Send(msg)) {
     *file = base::kInvalidPlatformFileValue;
@@ skipping 766 matching lines @@
   else
     return render_view_->mouse_lock_dispatcher();
 }
 
 webkit_glue::ClipboardClient*
     PepperPluginDelegateImpl::CreateClipboardClient() const {
   return new RendererClipboardClient;
 }
 
 }  // namespace content