| Index: ppapi/cpp/file_ref.cc
|
| diff --git a/ppapi/cpp/file_ref.cc b/ppapi/cpp/file_ref.cc
|
| index 0bc9487eb5eb9205ba630b158f0965ebf646042a..82a356ce4f256488b1399cf154db65b951d77fdd 100644
|
| --- a/ppapi/cpp/file_ref.cc
|
| +++ b/ppapi/cpp/file_ref.cc
|
| @@ -22,6 +22,10 @@ template <> const char* interface_name<PPB_FileRef_1_1>() {
|
| return PPB_FILEREF_INTERFACE_1_1;
|
| }
|
|
|
| +template <> const char* interface_name<PPB_FileRef_1_2>() {
|
| + return PPB_FILEREF_INTERFACE_1_2;
|
| +}
|
| +
|
| } // namespace
|
|
|
| FileRef::FileRef(PP_Resource resource) : Resource(resource) {
|
| @@ -46,6 +50,8 @@ FileRef::FileRef(const FileRef& other)
|
| }
|
|
|
| PP_FileSystemType FileRef::GetFileSystemType() const {
|
| + if (has_interface<PPB_FileRef_1_2>())
|
| + return get_interface<PPB_FileRef_1_2>()->GetFileSystemType(pp_resource());
|
| if (has_interface<PPB_FileRef_1_1>())
|
| return get_interface<PPB_FileRef_1_1>()->GetFileSystemType(pp_resource());
|
| if (has_interface<PPB_FileRef_1_0>())
|
| @@ -54,6 +60,10 @@ PP_FileSystemType FileRef::GetFileSystemType() const {
|
| }
|
|
|
| Var FileRef::GetName() const {
|
| + if (has_interface<PPB_FileRef_1_2>()) {
|
| + return Var(PASS_REF,
|
| + get_interface<PPB_FileRef_1_2>()->GetName(pp_resource()));
|
| + }
|
| if (has_interface<PPB_FileRef_1_1>()) {
|
| return Var(PASS_REF,
|
| get_interface<PPB_FileRef_1_1>()->GetName(pp_resource()));
|
| @@ -66,6 +76,10 @@ Var FileRef::GetName() const {
|
| }
|
|
|
| Var FileRef::GetPath() const {
|
| + if (has_interface<PPB_FileRef_1_2>()) {
|
| + return Var(PASS_REF,
|
| + get_interface<PPB_FileRef_1_2>()->GetPath(pp_resource()));
|
| + }
|
| if (has_interface<PPB_FileRef_1_1>()) {
|
| return Var(PASS_REF,
|
| get_interface<PPB_FileRef_1_1>()->GetPath(pp_resource()));
|
| @@ -78,6 +92,10 @@ Var FileRef::GetPath() const {
|
| }
|
|
|
| FileRef FileRef::GetParent() const {
|
| + if (has_interface<PPB_FileRef_1_2>()) {
|
| + return FileRef(PASS_REF,
|
| + get_interface<PPB_FileRef_1_2>()->GetParent(pp_resource()));
|
| + }
|
| if (has_interface<PPB_FileRef_1_1>()) {
|
| return FileRef(PASS_REF,
|
| get_interface<PPB_FileRef_1_1>()->GetParent(pp_resource()));
|
| @@ -90,6 +108,12 @@ FileRef FileRef::GetParent() const {
|
| }
|
|
|
| int32_t FileRef::MakeDirectory(const CompletionCallback& cc) {
|
| + if (has_interface<PPB_FileRef_1_2>()) {
|
| + return get_interface<PPB_FileRef_1_2>()->MakeDirectory(
|
| + pp_resource(),
|
| + PP_FALSE, // make_ancestors
|
| + cc.pp_completion_callback());
|
| + }
|
| if (has_interface<PPB_FileRef_1_1>()) {
|
| return get_interface<PPB_FileRef_1_1>()->MakeDirectory(
|
| pp_resource(),
|
| @@ -107,6 +131,12 @@ int32_t FileRef::MakeDirectory(const CompletionCallback& cc) {
|
|
|
| int32_t FileRef::MakeDirectoryIncludingAncestors(
|
| const CompletionCallback& cc) {
|
| + if (has_interface<PPB_FileRef_1_2>()) {
|
| + return get_interface<PPB_FileRef_1_2>()->MakeDirectory(
|
| + pp_resource(),
|
| + PP_TRUE, // make_ancestors
|
| + cc.pp_completion_callback());
|
| + }
|
| if (has_interface<PPB_FileRef_1_1>()) {
|
| return get_interface<PPB_FileRef_1_1>()->MakeDirectory(
|
| pp_resource(),
|
| @@ -122,9 +152,26 @@ int32_t FileRef::MakeDirectoryIncludingAncestors(
|
| return cc.MayForce(PP_ERROR_NOINTERFACE);
|
| }
|
|
|
| +int32_t FileRef::MakeDirectoryExclusive(
|
| + PP_Bool make_ancestors,
|
| + const CompletionCallback& cc) {
|
| + if (has_interface<PPB_FileRef_1_2>()) {
|
| + return get_interface<PPB_FileRef_1_2>()->MakeDirectoryExclusive(
|
| + pp_resource(),
|
| + make_ancestors,
|
| + cc.pp_completion_callback());
|
| + }
|
| + return cc.MayForce(PP_ERROR_NOINTERFACE);
|
| +}
|
| +
|
| int32_t FileRef::Touch(PP_Time last_access_time,
|
| PP_Time last_modified_time,
|
| const CompletionCallback& cc) {
|
| + if (has_interface<PPB_FileRef_1_2>()) {
|
| + return get_interface<PPB_FileRef_1_2>()->Touch(
|
| + pp_resource(), last_access_time, last_modified_time,
|
| + cc.pp_completion_callback());
|
| + }
|
| if (has_interface<PPB_FileRef_1_1>()) {
|
| return get_interface<PPB_FileRef_1_1>()->Touch(
|
| pp_resource(), last_access_time, last_modified_time,
|
| @@ -139,6 +186,10 @@ int32_t FileRef::Touch(PP_Time last_access_time,
|
| }
|
|
|
| int32_t FileRef::Delete(const CompletionCallback& cc) {
|
| + if (has_interface<PPB_FileRef_1_2>()) {
|
| + return get_interface<PPB_FileRef_1_2>()->Delete(
|
| + pp_resource(), cc.pp_completion_callback());
|
| + }
|
| if (has_interface<PPB_FileRef_1_1>()) {
|
| return get_interface<PPB_FileRef_1_1>()->Delete(
|
| pp_resource(), cc.pp_completion_callback());
|
| @@ -152,6 +203,10 @@ int32_t FileRef::Delete(const CompletionCallback& cc) {
|
|
|
| int32_t FileRef::Rename(const FileRef& new_file_ref,
|
| const CompletionCallback& cc) {
|
| + if (has_interface<PPB_FileRef_1_2>()) {
|
| + return get_interface<PPB_FileRef_1_2>()->Rename(
|
| + pp_resource(), new_file_ref.pp_resource(), cc.pp_completion_callback());
|
| + }
|
| if (has_interface<PPB_FileRef_1_1>()) {
|
| return get_interface<PPB_FileRef_1_1>()->Rename(
|
| pp_resource(), new_file_ref.pp_resource(), cc.pp_completion_callback());
|
| @@ -164,19 +219,29 @@ int32_t FileRef::Rename(const FileRef& new_file_ref,
|
| }
|
|
|
| int32_t FileRef::Query(const CompletionCallbackWithOutput<PP_FileInfo>& cc) {
|
| - if (!has_interface<PPB_FileRef_1_1>())
|
| - return cc.MayForce(PP_ERROR_NOINTERFACE);
|
| - return get_interface<PPB_FileRef_1_1>()->Query(
|
| - pp_resource(), cc.output(), cc.pp_completion_callback());
|
| + if (has_interface<PPB_FileRef_1_2>()) {
|
| + return get_interface<PPB_FileRef_1_2>()->Query(
|
| + pp_resource(), cc.output(), cc.pp_completion_callback());
|
| + }
|
| + if (has_interface<PPB_FileRef_1_1>()) {
|
| + return get_interface<PPB_FileRef_1_1>()->Query(
|
| + pp_resource(), cc.output(), cc.pp_completion_callback());
|
| + }
|
| + return cc.MayForce(PP_ERROR_NOINTERFACE);
|
| }
|
|
|
| int32_t FileRef::ReadDirectoryEntries(
|
| const CompletionCallbackWithOutput<std::vector<DirectoryEntry> >&
|
| callback) {
|
| - if (!has_interface<PPB_FileRef_1_1>())
|
| - return callback.MayForce(PP_ERROR_NOINTERFACE);
|
| - return get_interface<PPB_FileRef_1_1>()->ReadDirectoryEntries(
|
| - pp_resource(), callback.output(), callback.pp_completion_callback());
|
| + if (has_interface<PPB_FileRef_1_2>()) {
|
| + return get_interface<PPB_FileRef_1_2>()->ReadDirectoryEntries(
|
| + pp_resource(), callback.output(), callback.pp_completion_callback());
|
| + }
|
| + if (has_interface<PPB_FileRef_1_1>()) {
|
| + return get_interface<PPB_FileRef_1_1>()->ReadDirectoryEntries(
|
| + pp_resource(), callback.output(), callback.pp_completion_callback());
|
| + }
|
| + return callback.MayForce(PP_ERROR_NOINTERFACE);
|
| }
|
|
|
| } // namespace pp
|
|
|