Revert 243802 "PPAPI: Add new PPB_FileRef.MakeDirectory to suppo..."

trunk/src/ppapi/cpp/file_ref.cc

Index: trunk/src/ppapi/cpp/file_ref.cc
===================================================================
--- trunk/src/ppapi/cpp/file_ref.cc	(revision 243841)
+++ trunk/src/ppapi/cpp/file_ref.cc	(working copy)
@@ -4,7 +4,6 @@
 
 #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"
@@ -23,10 +22,6 @@
   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) {
@@ -37,10 +32,7 @@
 
 FileRef::FileRef(const FileSystem& file_system,
                  const char* path) {
-  if (has_interface<PPB_FileRef_1_2>()) {
-    PassRefFromConstructor(get_interface<PPB_FileRef_1_2>()->Create(
-        file_system.pp_resource(), path));
-  } else if (has_interface<PPB_FileRef_1_1>()) {
+  if (has_interface<PPB_FileRef_1_1>()) {
     PassRefFromConstructor(get_interface<PPB_FileRef_1_1>()->Create(
         file_system.pp_resource(), path));
   } else if (has_interface<PPB_FileRef_1_0>()) {
@@ -54,8 +46,6 @@
 }
 
 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>())
@@ -64,10 +54,6 @@
 }
 
 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()));
@@ -80,10 +66,6 @@
 }
 
 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()));
@@ -96,10 +78,6 @@
 }
 
 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()));
@@ -111,28 +89,34 @@
   return FileRef();
 }
 
-int32_t FileRef::MakeDirectory(int32_t make_directory_flags,
-                               const CompletionCallback& cc) {
-  if (has_interface<PPB_FileRef_1_2>()) {
-    return get_interface<PPB_FileRef_1_2>()->MakeDirectory(
+int32_t FileRef::MakeDirectory(const CompletionCallback& cc) {
+  if (has_interface<PPB_FileRef_1_1>()) {
+    return get_interface<PPB_FileRef_1_1>()->MakeDirectory(
         pp_resource(),
-        make_directory_flags,
+        PP_FALSE,  // make_ancestors
         cc.pp_completion_callback());
   }
+  if (has_interface<PPB_FileRef_1_0>()) {
+    return get_interface<PPB_FileRef_1_0>()->MakeDirectory(
+        pp_resource(),
+        PP_FALSE,  // 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>()) {
-    if (make_directory_flags & ~PP_MAKEDIRECTORYFLAG_WITH_ANCESTORS)
-      return cc.MayForce(PP_ERROR_NOTSUPPORTED);
     return get_interface<PPB_FileRef_1_1>()->MakeDirectory(
         pp_resource(),
-        PP_FromBool(make_directory_flags & PP_MAKEDIRECTORYFLAG_WITH_ANCESTORS),
+        PP_TRUE,  // make_ancestors
         cc.pp_completion_callback());
   }
   if (has_interface<PPB_FileRef_1_0>()) {
-    if (make_directory_flags & ~PP_MAKEDIRECTORYFLAG_WITH_ANCESTORS)
-      return cc.MayForce(PP_ERROR_NOTSUPPORTED);
     return get_interface<PPB_FileRef_1_0>()->MakeDirectory(
         pp_resource(),
-        PP_FromBool(make_directory_flags & PP_MAKEDIRECTORYFLAG_WITH_ANCESTORS),
+        PP_TRUE,  // make_ancestors
         cc.pp_completion_callback());
   }
   return cc.MayForce(PP_ERROR_NOINTERFACE);
@@ -141,11 +125,6 @@
 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,
@@ -160,10 +139,6 @@
 }
 
 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());
@@ -177,10 +152,6 @@
 
 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());
@@ -193,29 +164,19 @@
 }
 
 int32_t FileRef::Query(const CompletionCallbackWithOutput<PP_FileInfo>& cc) {
-  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);
+  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());
 }
 
 int32_t FileRef::ReadDirectoryEntries(
     const CompletionCallbackWithOutput<std::vector<DirectoryEntry> >&
         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);
+  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());
 }
 
 }  // namespace pp