Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Unified Diff: ppapi/cpp/file_io.cc

Issue 9712001: Check explicitly for version 1.0 PPB_File* interfaces in pp::File* wrappers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix missed interface_name definitions. Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ppapi/cpp/file_ref.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/cpp/file_io.cc
diff --git a/ppapi/cpp/file_io.cc b/ppapi/cpp/file_io.cc
index 399c4300566a44b2331ae996646e75c0b1bd9b72..4bda9052bd0a7308ea7da8b221a36e52ca1a74ea 100644
--- a/ppapi/cpp/file_io.cc
+++ b/ppapi/cpp/file_io.cc
@@ -16,8 +16,8 @@ namespace pp {
namespace {
-template <> const char* interface_name<PPB_FileIO>() {
- return PPB_FILEIO_INTERFACE;
+template <> const char* interface_name<PPB_FileIO_1_0>() {
+ return PPB_FILEIO_INTERFACE_1_0;
}
} // namespace
@@ -26,9 +26,9 @@ FileIO::FileIO() {
}
FileIO::FileIO(const InstanceHandle& instance) {
- if (!has_interface<PPB_FileIO>())
+ if (!has_interface<PPB_FileIO_1_0>())
return;
- PassRefFromConstructor(get_interface<PPB_FileIO>()->Create(
+ PassRefFromConstructor(get_interface<PPB_FileIO_1_0>()->Create(
instance.pp_instance()));
}
@@ -39,27 +39,27 @@ FileIO::FileIO(const FileIO& other)
int32_t FileIO::Open(const FileRef& file_ref,
int32_t open_flags,
const CompletionCallback& cc) {
- if (!has_interface<PPB_FileIO>())
+ if (!has_interface<PPB_FileIO_1_0>())
return cc.MayForce(PP_ERROR_NOINTERFACE);
- return get_interface<PPB_FileIO>()->Open(
+ return get_interface<PPB_FileIO_1_0>()->Open(
pp_resource(), file_ref.pp_resource(), open_flags,
cc.pp_completion_callback());
}
int32_t FileIO::Query(PP_FileInfo* result_buf,
const CompletionCallback& cc) {
- if (!has_interface<PPB_FileIO>())
+ if (!has_interface<PPB_FileIO_1_0>())
return cc.MayForce(PP_ERROR_NOINTERFACE);
- return get_interface<PPB_FileIO>()->Query(
+ return get_interface<PPB_FileIO_1_0>()->Query(
pp_resource(), result_buf, cc.pp_completion_callback());
}
int32_t FileIO::Touch(PP_Time last_access_time,
PP_Time last_modified_time,
const CompletionCallback& cc) {
- if (!has_interface<PPB_FileIO>())
+ if (!has_interface<PPB_FileIO_1_0>())
return cc.MayForce(PP_ERROR_NOINTERFACE);
- return get_interface<PPB_FileIO>()->Touch(
+ return get_interface<PPB_FileIO_1_0>()->Touch(
pp_resource(), last_access_time, last_modified_time,
cc.pp_completion_callback());
}
@@ -68,9 +68,9 @@ int32_t FileIO::Read(int64_t offset,
char* buffer,
int32_t bytes_to_read,
const CompletionCallback& cc) {
- if (!has_interface<PPB_FileIO>())
+ if (!has_interface<PPB_FileIO_1_0>())
return cc.MayForce(PP_ERROR_NOINTERFACE);
- return get_interface<PPB_FileIO>()->Read(pp_resource(),
+ return get_interface<PPB_FileIO_1_0>()->Read(pp_resource(),
offset, buffer, bytes_to_read, cc.pp_completion_callback());
}
@@ -78,32 +78,32 @@ int32_t FileIO::Write(int64_t offset,
const char* buffer,
int32_t bytes_to_write,
const CompletionCallback& cc) {
- if (!has_interface<PPB_FileIO>())
+ if (!has_interface<PPB_FileIO_1_0>())
return cc.MayForce(PP_ERROR_NOINTERFACE);
- return get_interface<PPB_FileIO>()->Write(
+ return get_interface<PPB_FileIO_1_0>()->Write(
pp_resource(), offset, buffer, bytes_to_write,
cc.pp_completion_callback());
}
int32_t FileIO::SetLength(int64_t length,
const CompletionCallback& cc) {
- if (!has_interface<PPB_FileIO>())
+ if (!has_interface<PPB_FileIO_1_0>())
return cc.MayForce(PP_ERROR_NOINTERFACE);
- return get_interface<PPB_FileIO>()->SetLength(
+ return get_interface<PPB_FileIO_1_0>()->SetLength(
pp_resource(), length, cc.pp_completion_callback());
}
int32_t FileIO::Flush(const CompletionCallback& cc) {
- if (!has_interface<PPB_FileIO>())
+ if (!has_interface<PPB_FileIO_1_0>())
return cc.MayForce(PP_ERROR_NOINTERFACE);
- return get_interface<PPB_FileIO>()->Flush(
+ return get_interface<PPB_FileIO_1_0>()->Flush(
pp_resource(), cc.pp_completion_callback());
}
void FileIO::Close() {
- if (!has_interface<PPB_FileIO>())
+ if (!has_interface<PPB_FileIO_1_0>())
return;
- get_interface<PPB_FileIO>()->Close(pp_resource());
+ get_interface<PPB_FileIO_1_0>()->Close(pp_resource());
}
} // namespace pp
« no previous file with comments | « no previous file | ppapi/cpp/file_ref.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698