Refactor FileSystem

webkit/plugins/ppapi/resource_creation_impl.cc

Index: webkit/plugins/ppapi/resource_creation_impl.cc
diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc
index d7be2668515bbe98a46aec9b179f9085ea7c06d0..695fb308c344e3fd1e023f634efa7e1beba5d5dd 100644
--- a/webkit/plugins/ppapi/resource_creation_impl.cc
+++ b/webkit/plugins/ppapi/resource_creation_impl.cc
@@ -14,7 +14,6 @@
 #include "webkit/plugins/ppapi/ppb_broker_impl.h"
 #include "webkit/plugins/ppapi/ppb_buffer_impl.h"
 #include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
-#include "webkit/plugins/ppapi/ppb_file_system_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_message_loop_impl.h"
 #include "webkit/plugins/ppapi/ppb_graphics_3d_impl.h"
 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
@@ -82,16 +81,16 @@ PP_Resource ResourceCreationImpl::CreateDirectoryReader(
   return 0;  // Not supported in-process.
 }
 
-PP_Resource ResourceCreationImpl::CreateFileRef(PP_Resource file_system,
-                                                const char* path) {
-  PPB_FileRef_Impl* res = PPB_FileRef_Impl::CreateInternal(file_system, path);
-  return res ? res->GetReference() : 0;
-}
-
-PP_Resource ResourceCreationImpl::CreateFileSystem(
+PP_Resource ResourceCreationImpl::CreateFileRef(
     PP_Instance instance,
-    PP_FileSystemType type) {
-  return PPB_FileSystem_Impl::Create(instance, type);
+    PP_Resource file_system,
+    const char* path) {
+  PPB_FileRef_Impl* res = PPB_FileRef_Impl::CreateInternal(
+      instance, file_system, path);
+  if (!res)
+    return 0;
+  res->AddFileSystemRefCount();

[yzshen1, 2013/04/11 17:04:57]

This method will also get run for the renderer side in out-of-process mode. So
it doesn't work. (Have you tested this code? Am I missing anything?)

I think one way is to check RendererPpapiHost::IsRunningInProcess(), if yes, you
will need to add ref for the FileSystem in PPB_FileRef_Impl.

https://code.google.com/p/chromium/codesearch#chromium/src/content/public/ren...

(You will need some work to expose this to code in webkit/plugins/, though.)

[victorhsieh, 2013/04/11 18:24:38]

I thought this is only used in process (only used by
pepper_in_process_resource_creation.cc)?

+  return res->GetReference();
 }
 
 PP_Resource ResourceCreationImpl::CreateFlashDeviceID(PP_Instance instance) {