CRX FileSystem Pepper private API

ppapi/thunk/ppb_file_ref_thunk.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 "ppapi/c/pp_file_info.h"
 #include "ppapi/c/ppb_file_ref.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_file_ref_private.h"
+#include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 #include "ppapi/thunk/ppb_file_ref_api.h"
 #include "ppapi/thunk/ppb_file_system_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 
 namespace ppapi {
 namespace thunk {
 
 namespace {
 
 typedef EnterResource<PPB_FileRef_API> EnterFileRef;
 
 PP_Resource Create(PP_Resource file_system, const char* path) {
   ppapi::ProxyAutoLock lock;
-  EnterResourceNoLock<PPB_FileSystem_API> enter_file_system(file_system, true);
-  if (enter_file_system.failed())
+
+  // Make sure the file_system is one of the expected types.
+  EnterResourceNoLock<PPB_FileSystem_API> enter_file_system(file_system, false);
+  EnterResourceNoLock<PPB_Ext_CrxFileSystem_Private_API> enter_crxfs(

[yzshen1, 2013/05/02 23:22:01]

You don't need this anymore.

[victorhsieh, 2013/05/03 17:26:58]

Done.

+      file_system, false);
+  if (enter_file_system.failed() && enter_crxfs.failed())
     return 0;
-  PP_Instance instance = enter_file_system.resource()->pp_instance();
+
+  // Since file_system is either type of filesystem above, we don't need to
+  // check null-ness below.
+  Resource* res = PpapiGlobals::Get()->GetResourceTracker()->
+      GetResource(file_system);
+  PP_Instance instance = res->pp_instance();
   EnterResourceCreationNoLock enter(instance);
   if (enter.failed())
     return 0;
   return enter.functions()->CreateFileRef(instance, file_system, path);
 }
 
 PP_Bool IsFileRef(PP_Resource resource) {
   EnterFileRef enter(resource, false);
   return PP_FromBool(enter.succeeded());
 }
@@ skipping 122 matching lines @@
 const PPB_FileRef_1_1* GetPPB_FileRef_1_1_Thunk() {
   return &g_ppb_file_ref_thunk_1_1;
 }
 
 const PPB_FileRefPrivate_0_1* GetPPB_FileRefPrivate_0_1_Thunk() {
   return &g_ppb_file_ref_private_thunk;
 }
 
 }  // namespace thunk
 }  // namespace ppapi