Bug 1299500 - Get rid of DeviceStorage API - part 6 - Directory::Crea…

…teDirectory, r=ehsan
Brli · Mar 8, 2017 · 4230518 · 4230518
1 parent b5d2719
commit 4230518
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 371 deletions.
diff --git a/dom/filesystem/CreateDirectoryTask.cpp b/dom/filesystem/CreateDirectoryTask.cpp
diff --git a/dom/filesystem/CreateDirectoryTask.h b/dom/filesystem/CreateDirectoryTask.h
diff --git a/dom/filesystem/Directory.cpp b/dom/filesystem/Directory.cpp
@@ -6,7 +6,6 @@
 
 #include "mozilla/dom/Directory.h"
 
-#include "CreateDirectoryTask.h"
 #include "FileSystemPermissionRequest.h"
 #include "GetDirectoryListingTask.h"
 #include "GetFileOrDirectoryTask.h"
@@ -21,13 +20,6 @@
 #include "mozilla/dom/FileSystemUtils.h"
 #include "mozilla/dom/OSFileSystem.h"
 
-// Resolve the name collision of Microsoft's API name with macros defined in
-// Windows header files. Undefine the macro of CreateDirectory to avoid
-// Directory#CreateDirectory being replaced by Directory#CreateDirectoryW.
-#ifdef CreateDirectory
-#undef CreateDirectory
-#endif
-
 namespace mozilla {
 namespace dom {
 
@@ -188,31 +180,6 @@ Directory::GetName(nsAString& aRetval, ErrorResult& aRv)
   fs->GetDirectoryName(mFile, aRetval, aRv);
 }
 
-already_AddRefed<Promise>
-Directory::CreateDirectory(const nsAString& aPath, ErrorResult& aRv)
-{
-  // Only exposed for DeviceStorage.
-  MOZ_ASSERT(NS_IsMainThread());
-
-  nsCOMPtr<nsIFile> realPath;
-  nsresult error = DOMPathToRealPath(aPath, getter_AddRefs(realPath));
-
-  RefPtr<FileSystemBase> fs = GetFileSystem(aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  RefPtr<CreateDirectoryTaskChild> task =
-    CreateDirectoryTaskChild::Create(fs, realPath, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  task->SetError(error);
-  FileSystemPermissionRequest::RequestForTask(task);
-  return task->GetPromise();
-}
-
 already_AddRefed<Promise>
 Directory::Get(const nsAString& aPath, ErrorResult& aRv)
 {

diff --git a/dom/filesystem/Directory.h b/dom/filesystem/Directory.h
@@ -14,13 +14,6 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 
-// Resolve the name collision of Microsoft's API name with macros defined in
-// Windows header files. Undefine the macro of CreateDirectory to avoid
-// Directory#CreateDirectory being replaced by Directory#CreateDirectoryW.
-#ifdef CreateDirectory
-#undef CreateDirectory
-#endif
-
 namespace mozilla {
 namespace dom {
 
@@ -65,9 +58,6 @@ class Directory final
   void
   GetName(nsAString& aRetval, ErrorResult& aRv);
 
-  already_AddRefed<Promise>
-  CreateDirectory(const nsAString& aPath, ErrorResult& aRv);
-
   already_AddRefed<Promise>
   Get(const nsAString& aPath, ErrorResult& aRv);