Refactor FileSystem

webkit/plugins/ppapi/resource_creation_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 "webkit/plugins/ppapi/resource_creation_impl.h"
 
 #include "ppapi/c/pp_size.h"
 #include "ppapi/shared_impl/ppb_audio_config_shared.h"
 #include "ppapi/shared_impl/ppb_input_event_shared.h"
 #include "ppapi/shared_impl/ppb_resource_array_shared.h"
 #include "ppapi/shared_impl/var.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/ppb_audio_impl.h"
 #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"
 #include "webkit/plugins/ppapi/ppb_network_monitor_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
 #include "webkit/plugins/ppapi/ppb_tcp_server_socket_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_tcp_socket_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h"
 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
 #include "webkit/plugins/ppapi/ppb_x509_certificate_private_impl.h"
@@ skipping 47 matching lines @@
                                                uint32_t size) {
   return PPB_Buffer_Impl::Create(instance, size);
 }
 
 PP_Resource ResourceCreationImpl::CreateDirectoryReader(
     PP_Instance instance,
     PP_Resource directory_ref) {
   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) {
   return 0;  // Not supported in-process.
 }
 
 PP_Resource ResourceCreationImpl::CreateFlashFontFile(
     PP_Instance instance,
     const PP_BrowserFont_Trusted_Description* description,
     PP_PrivateFontCharset charset) {
@@ skipping 160 matching lines @@
       wheel_delta, wheel_ticks, scroll_by_page);
 }
 
 PP_Resource ResourceCreationImpl::CreateX509CertificatePrivate(
     PP_Instance instance) {
   return PPB_X509Certificate_Private_Impl::CreateResource(instance);
 }
 
 }  // namespace ppapi
 }  // namespace webkit