Index: webkit/glue/plugins/pepper_file_io.cc |
diff --git a/webkit/glue/plugins/pepper_file_io.cc b/webkit/glue/plugins/pepper_file_io.cc |
index 72ffc129a7a35dd1c6610c7d49dcb2098493fc51..926a6db202e0f150a52d59e0a37c112fb50b2353 100644 |
--- a/webkit/glue/plugins/pepper_file_io.cc |
+++ b/webkit/glue/plugins/pepper_file_io.cc |
@@ -28,20 +28,18 @@ PP_Resource Create(PP_Module module_id) { |
} |
bool IsFileIO(PP_Resource resource) { |
- return !!ResourceTracker::Get()->GetAsFileIO(resource).get(); |
+ return !!Resource::GetAs<FileIO>(resource).get(); |
} |
int32_t Open(PP_Resource file_io_id, |
PP_Resource file_ref_id, |
int32_t open_flags, |
PP_CompletionCallback callback) { |
- scoped_refptr<FileIO> file_io( |
- ResourceTracker::Get()->GetAsFileIO(file_io_id)); |
+ scoped_refptr<FileIO> file_io(Resource::GetAs<FileIO>(file_io_id)); |
if (!file_io.get()) |
return PP_Error_BadResource; |
- scoped_refptr<FileRef> file_ref( |
- ResourceTracker::Get()->GetAsFileRef(file_ref_id)); |
+ scoped_refptr<FileRef> file_ref(Resource::GetAs<FileRef>(file_ref_id)); |
if (!file_ref.get()) |
return PP_Error_BadResource; |
@@ -51,8 +49,7 @@ int32_t Open(PP_Resource file_io_id, |
int32_t Query(PP_Resource file_io_id, |
PP_FileInfo* info, |
PP_CompletionCallback callback) { |
- scoped_refptr<FileIO> file_io( |
- ResourceTracker::Get()->GetAsFileIO(file_io_id)); |
+ scoped_refptr<FileIO> file_io(Resource::GetAs<FileIO>(file_io_id)); |
if (!file_io.get()) |
return PP_Error_BadResource; |
@@ -63,8 +60,7 @@ int32_t Touch(PP_Resource file_io_id, |
PP_Time last_access_time, |
PP_Time last_modified_time, |
PP_CompletionCallback callback) { |
- scoped_refptr<FileIO> file_io( |
- ResourceTracker::Get()->GetAsFileIO(file_io_id)); |
+ scoped_refptr<FileIO> file_io(Resource::GetAs<FileIO>(file_io_id)); |
if (!file_io.get()) |
return PP_Error_BadResource; |
@@ -76,8 +72,7 @@ int32_t Read(PP_Resource file_io_id, |
char* buffer, |
int32_t bytes_to_read, |
PP_CompletionCallback callback) { |
- scoped_refptr<FileIO> file_io( |
- ResourceTracker::Get()->GetAsFileIO(file_io_id)); |
+ scoped_refptr<FileIO> file_io(Resource::GetAs<FileIO>(file_io_id)); |
if (!file_io.get()) |
return PP_Error_BadResource; |
@@ -89,8 +84,7 @@ int32_t Write(PP_Resource file_io_id, |
const char* buffer, |
int32_t bytes_to_write, |
PP_CompletionCallback callback) { |
- scoped_refptr<FileIO> file_io( |
- ResourceTracker::Get()->GetAsFileIO(file_io_id)); |
+ scoped_refptr<FileIO> file_io(Resource::GetAs<FileIO>(file_io_id)); |
if (!file_io.get()) |
return PP_Error_BadResource; |
@@ -100,8 +94,7 @@ int32_t Write(PP_Resource file_io_id, |
int32_t SetLength(PP_Resource file_io_id, |
int64_t length, |
PP_CompletionCallback callback) { |
- scoped_refptr<FileIO> file_io( |
- ResourceTracker::Get()->GetAsFileIO(file_io_id)); |
+ scoped_refptr<FileIO> file_io(Resource::GetAs<FileIO>(file_io_id)); |
if (!file_io.get()) |
return PP_Error_BadResource; |
@@ -110,8 +103,7 @@ int32_t SetLength(PP_Resource file_io_id, |
int32_t Flush(PP_Resource file_io_id, |
PP_CompletionCallback callback) { |
- scoped_refptr<FileIO> file_io( |
- ResourceTracker::Get()->GetAsFileIO(file_io_id)); |
+ scoped_refptr<FileIO> file_io(Resource::GetAs<FileIO>(file_io_id)); |
if (!file_io.get()) |
return PP_Error_BadResource; |
@@ -119,8 +111,7 @@ int32_t Flush(PP_Resource file_io_id, |
} |
void Close(PP_Resource file_io_id) { |
- scoped_refptr<FileIO> file_io( |
- ResourceTracker::Get()->GetAsFileIO(file_io_id)); |
+ scoped_refptr<FileIO> file_io(Resource::GetAs<FileIO>(file_io_id)); |
if (!file_io.get()) |
return; |
@@ -141,8 +132,7 @@ const PPB_FileIO ppb_fileio = { |
}; |
int32_t GetOSFileDescriptor(PP_Resource file_io_id) { |
- scoped_refptr<FileIO> file_io( |
- ResourceTracker::Get()->GetAsFileIO(file_io_id)); |
+ scoped_refptr<FileIO> file_io(Resource::GetAs<FileIO>(file_io_id)); |
if (!file_io.get()) |
return PP_Error_BadResource; |
@@ -153,8 +143,7 @@ int32_t WillWrite(PP_Resource file_io_id, |
int64_t offset, |
int32_t bytes_to_write, |
PP_CompletionCallback callback) { |
- scoped_refptr<FileIO> file_io( |
- ResourceTracker::Get()->GetAsFileIO(file_io_id)); |
+ scoped_refptr<FileIO> file_io(Resource::GetAs<FileIO>(file_io_id)); |
if (!file_io.get()) |
return PP_Error_BadResource; |
@@ -164,8 +153,7 @@ int32_t WillWrite(PP_Resource file_io_id, |
int32_t WillSetLength(PP_Resource file_io_id, |
int64_t length, |
PP_CompletionCallback callback) { |
- scoped_refptr<FileIO> file_io( |
- ResourceTracker::Get()->GetAsFileIO(file_io_id)); |
+ scoped_refptr<FileIO> file_io(Resource::GetAs<FileIO>(file_io_id)); |
if (!file_io.get()) |
return PP_Error_BadResource; |