Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/ppb_file_ref_impl.cc

 // Copyright (c) 2011 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/ppb_file_ref_impl.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_file_system_api.h"
 #include "ppapi/shared_impl/time_conversion.h"
 #include "ppapi/shared_impl/var.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/file_callbacks.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h"
 #include "webkit/plugins/ppapi/ppb_file_system_impl.h"
+#include "webkit/plugins/ppapi/resource_helper.h"
 
 using ppapi::PPTimeToTime;
 using ppapi::StringVar;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_FileRef_API;
 using ppapi::thunk::PPB_FileSystem_API;
 
 namespace webkit {
 namespace ppapi {
 
@@ skipping 19 matching lines @@
 }
 
 }  // namespace
 
 PPB_FileRef_Impl::PPB_FileRef_Impl()
     : Resource(NULL),
       file_system_(NULL) {
 }
 
 PPB_FileRef_Impl::PPB_FileRef_Impl(
-    PluginInstance* instance,
+    PP_Instance instance,
     scoped_refptr<PPB_FileSystem_Impl> file_system,
     const std::string& validated_path)
     : Resource(instance),
       file_system_(file_system),
       virtual_path_(validated_path) {
 }
 
-PPB_FileRef_Impl::PPB_FileRef_Impl(PluginInstance* instance,
+PPB_FileRef_Impl::PPB_FileRef_Impl(PP_Instance instance,
                                    const FilePath& external_file_path)
     : Resource(instance),
       file_system_(NULL),
       system_path_(external_file_path) {
 }
 
 PPB_FileRef_Impl::~PPB_FileRef_Impl() {
 }
 
 // static
 PP_Resource PPB_FileRef_Impl::Create(PP_Resource pp_file_system,
                                      const char* path) {
   EnterResourceNoLock<PPB_FileSystem_API> enter(pp_file_system, true);
   if (enter.failed())
     return 0;
 
   PPB_FileSystem_Impl* file_system =
       static_cast<PPB_FileSystem_Impl*>(enter.object());
-  if (!file_system->instance())
+  if (!file_system->pp_instance())
     return 0;
 
   if (file_system->type() != PP_FILESYSTEMTYPE_LOCALPERSISTENT &&
       file_system->type() != PP_FILESYSTEMTYPE_LOCALTEMPORARY)
     return 0;
 
   std::string validated_path(path);
   if (!IsValidLocalPath(validated_path))
     return 0;
   TrimTrailingSlash(&validated_path);
 
-  return (new PPB_FileRef_Impl(file_system->instance(),
+  return (new PPB_FileRef_Impl(file_system->pp_instance(),
                                file_system, validated_path))->GetReference();
 }
 
 PPB_FileRef_API* PPB_FileRef_Impl::AsPPB_FileRef_API() {
   return this;
 }
 
 PPB_FileRef_Impl* PPB_FileRef_Impl::AsPPB_FileRef_Impl() {
   return this;
 }
@@ skipping 21 matching lines @@
 #endif
   } else if (virtual_path_.size() == 1 && virtual_path_[0] == '/') {
     result = virtual_path_;
   } else {
     // There should always be a leading slash at least!
     size_t pos = virtual_path_.rfind('/');
     DCHECK(pos != std::string::npos);
     result = virtual_path_.substr(pos + 1);
   }
 
-  return StringVar::StringToPPVar(instance()->module()->pp_module(), result);
+  return StringVar::StringToPPVar(
+      ResourceHelper::GetPluginModule(this)->pp_module(), result);
 }
 
 PP_Var PPB_FileRef_Impl::GetPath() const {
   if (GetFileSystemType() == PP_FILESYSTEMTYPE_EXTERNAL)
     return PP_MakeUndefined();
-  return StringVar::StringToPPVar(instance()->module()->pp_module(),
-                                  virtual_path_);
+  return StringVar::StringToPPVar(
+      ResourceHelper::GetPluginModule(this)->pp_module(), virtual_path_);
 }
 
 PP_Resource PPB_FileRef_Impl::GetParent() {
   if (GetFileSystemType() == PP_FILESYSTEMTYPE_EXTERNAL)
     return 0;
 
   // There should always be a leading slash at least!
   size_t pos = virtual_path_.rfind('/');
   DCHECK(pos != std::string::npos);
 
   // If the path is "/foo", then we want to include the slash.
   if (pos == 0)
     pos++;
   std::string parent_path = virtual_path_.substr(0, pos);
 
   scoped_refptr<PPB_FileRef_Impl> parent_ref(
-      new PPB_FileRef_Impl(instance(), file_system_, parent_path));
+      new PPB_FileRef_Impl(pp_instance(), file_system_, parent_path));
   return parent_ref->GetReference();
 }
 
 int32_t PPB_FileRef_Impl::MakeDirectory(PP_Bool make_ancestors,
                                         PP_CompletionCallback callback) {
   if (!IsValidNonExternalFileSystem())
     return PP_ERROR_NOACCESS;
-  if (!instance()->delegate()->MakeDirectory(
+
+  PluginInstance* instance = ResourceHelper::GetPluginInstance(this);
+  if (!instance->delegate()->MakeDirectory(
           GetFileSystemURL(), PP_ToBool(make_ancestors),
-          new FileCallbacks(instance()->module()->AsWeakPtr(),
+          new FileCallbacks(instance->module()->AsWeakPtr(),
                             pp_resource(), callback, NULL, NULL, NULL)))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_FileRef_Impl::Touch(PP_Time last_access_time,
                                 PP_Time last_modified_time,
                                 PP_CompletionCallback callback) {
   if (!IsValidNonExternalFileSystem())
     return PP_ERROR_NOACCESS;
-  if (!instance()->delegate()->Touch(
+  PluginInstance* instance = ResourceHelper::GetPluginInstance(this);
+  if (!instance->delegate()->Touch(
           GetFileSystemURL(),
           PPTimeToTime(last_access_time),
           PPTimeToTime(last_modified_time),
-          new FileCallbacks(instance()->module()->AsWeakPtr(),
+          new FileCallbacks(instance->module()->AsWeakPtr(),
                             pp_resource(), callback, NULL, NULL, NULL)))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_FileRef_Impl::Delete(PP_CompletionCallback callback) {
   if (!IsValidNonExternalFileSystem())
     return PP_ERROR_NOACCESS;
-  if (!instance()->delegate()->Delete(
+  PluginInstance* instance = ResourceHelper::GetPluginInstance(this);
+  if (!instance->delegate()->Delete(
           GetFileSystemURL(),
-          new FileCallbacks(instance()->module()->AsWeakPtr(),
+          new FileCallbacks(instance->module()->AsWeakPtr(),
                             pp_resource(), callback, NULL, NULL, NULL)))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_FileRef_Impl::Rename(PP_Resource new_pp_file_ref,
                                  PP_CompletionCallback callback) {
   EnterResourceNoLock<PPB_FileRef_API> enter(new_pp_file_ref, true);
   if (enter.failed())
     return PP_ERROR_BADRESOURCE;
   PPB_FileRef_Impl* new_file_ref =
       static_cast<PPB_FileRef_Impl*>(enter.object());
 
   if (!IsValidNonExternalFileSystem() ||
       file_system_.get() != new_file_ref->file_system_.get())
     return PP_ERROR_NOACCESS;
 
   // TODO(viettrungluu): Also cancel when the new file ref is destroyed?
   // http://crbug.com/67624
-  if (!instance()->delegate()->Rename(
+  PluginInstance* instance = ResourceHelper::GetPluginInstance(this);
+  if (!instance->delegate()->Rename(
           GetFileSystemURL(), new_file_ref->GetFileSystemURL(),
-          new FileCallbacks(instance()->module()->AsWeakPtr(),
+          new FileCallbacks(instance->module()->AsWeakPtr(),
                             pp_resource(), callback, NULL, NULL, NULL)))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }
 
 FilePath PPB_FileRef_Impl::GetSystemPath() const {
   if (GetFileSystemType() != PP_FILESYSTEMTYPE_EXTERNAL) {
     NOTREACHED();
     return FilePath();
   }
@@ skipping 16 matching lines @@
   return GURL(file_system_->root_url().spec() + virtual_path_.substr(1));
 }
 
 bool PPB_FileRef_Impl::IsValidNonExternalFileSystem() const {
   return file_system_ && file_system_->opened() &&
       file_system_->type() != PP_FILESYSTEMTYPE_EXTERNAL;
 }
 
 }  // namespace ppapi
 }  // namespace webkit