PPAPI: Add new PPB_FileRef.MakeDirectory to support exclusive operation

ppapi/cpp/file_ref.cc

Index: ppapi/cpp/file_ref.cc
diff --git a/ppapi/cpp/file_ref.cc b/ppapi/cpp/file_ref.cc
index 0bc9487eb5eb9205ba630b158f0965ebf646042a..4cc4037c0b65a819292d2c22d20249f65e18a822 100644
--- a/ppapi/cpp/file_ref.cc
+++ b/ppapi/cpp/file_ref.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/cpp/file_ref.h"
 
+#include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/directory_entry.h"
@@ -22,6 +23,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 +51,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 +61,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 +77,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 +93,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()));
@@ -89,34 +108,26 @@ FileRef FileRef::GetParent() const {
   return FileRef();
 }
 
-int32_t FileRef::MakeDirectory(const CompletionCallback& cc) {
-  if (has_interface<PPB_FileRef_1_1>()) {
-    return get_interface<PPB_FileRef_1_1>()->MakeDirectory(
-        pp_resource(),
-        PP_FALSE,  // make_ancestors
-        cc.pp_completion_callback());
-  }
-  if (has_interface<PPB_FileRef_1_0>()) {
-    return get_interface<PPB_FileRef_1_0>()->MakeDirectory(
+int32_t FileRef::MakeDirectory(bool exclusive,
+                               bool make_ancestors,
+                               const CompletionCallback& cc) {
+  if (has_interface<PPB_FileRef_1_2>()) {
+    return get_interface<PPB_FileRef_1_2>()->MakeDirectory(
         pp_resource(),
-        PP_FALSE,  // make_ancestors
+        PP_FromBool(exclusive),
+        PP_FromBool(make_ancestors),
         cc.pp_completion_callback());
   }
-  return cc.MayForce(PP_ERROR_NOINTERFACE);
-}
-
-int32_t FileRef::MakeDirectoryIncludingAncestors(
-    const CompletionCallback& cc) {
   if (has_interface<PPB_FileRef_1_1>()) {
     return get_interface<PPB_FileRef_1_1>()->MakeDirectory(
         pp_resource(),

[yzshen1, 2013/12/20 18:23:57]

It seems incorrect to ignore "exclusive" silently.

Maybe we could consider:
(1) fail the call when exclusive==true, but we don't have interface 1.2
(2) make two versions of MakeDirectory(), one with |exclusive| parameter, one
without.

What do you think?

[nhiroki, 2014/01/06 13:24:22]

Hmm... each of them seems to have its merits and demerits.

(1) would be simple, but plugin developers might get confused the parameter
behavior. As for (2), we need to maintain both versions and that seems painful
to me...

I don't have strong opinions, but I'd somewhat prefer (1). WDYT?

[yzshen1, 2014/01/06 17:53:16]

I am fine with (1). Thanks!

WRT (2), I think it is also okay, because we have to maintain C API v1.0 and 1.1
forever anyway.

-        PP_TRUE,  // make_ancestors
+        PP_FromBool(make_ancestors),
         cc.pp_completion_callback());
   }
   if (has_interface<PPB_FileRef_1_0>()) {
     return get_interface<PPB_FileRef_1_0>()->MakeDirectory(
         pp_resource(),
-        PP_TRUE,  // make_ancestors
+        PP_Bool(make_ancestors),
         cc.pp_completion_callback());
   }
   return cc.MayForce(PP_ERROR_NOINTERFACE);
@@ -125,6 +136,11 @@ int32_t FileRef::MakeDirectoryIncludingAncestors(
 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 +155,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 +172,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 +188,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