Bug 1284987 - Entries API - part 1 - DOMString to USVString, r=smaug

This commit is contained in:
Andrea Marchesini 2016-11-03 07:55:17 +01:00
parent bcf48e11c8
commit 6db54bcb2f
5 changed files with 12 additions and 21 deletions

View File

@ -46,19 +46,21 @@ public:
CreateReader() const;
void
GetFile(const nsAString& aPath, const FileSystemFlags& aFlag,
GetFile(const Optional<nsAString>& aPath, const FileSystemFlags& aFlag,
const Optional<OwningNonNull<FileSystemEntryCallback>>& aSuccessCallback,
const Optional<OwningNonNull<ErrorCallback>>& aErrorCallback) const
{
GetInternal(aPath, aFlag, aSuccessCallback, aErrorCallback, eGetFile);
GetInternal(aPath.WasPassed() ? aPath.Value() : EmptyString(),
aFlag, aSuccessCallback, aErrorCallback, eGetFile);
}
void
GetDirectory(const nsAString& aPath, const FileSystemFlags& aFlag,
GetDirectory(const Optional<nsAString>& aPath, const FileSystemFlags& aFlag,
const Optional<OwningNonNull<FileSystemEntryCallback>>& aSuccessCallback,
const Optional<OwningNonNull<ErrorCallback>>& aErrorCallback) const
{
GetInternal(aPath, aFlag, aSuccessCallback, aErrorCallback, eGetDirectory);
GetInternal(aPath.WasPassed() ? aPath.Value() : EmptyString(),
aFlag, aSuccessCallback, aErrorCallback, eGetDirectory);
}
void

View File

@ -41,7 +41,7 @@ partial interface File {
readonly attribute Date lastModifiedDate;
[BinaryName="path", Func="mozilla::dom::Directory::WebkitBlinkDirectoryPickerEnabled"]
readonly attribute DOMString webkitRelativePath;
readonly attribute USVString webkitRelativePath;
[GetterThrows, ChromeOnly]
readonly attribute DOMString mozFullPath;

View File

@ -24,6 +24,6 @@ callback interface ErrorCallback {
};
interface FileSystem {
readonly attribute DOMString name;
readonly attribute USVString name;
readonly attribute FileSystemDirectoryEntry root;
};

View File

@ -7,12 +7,12 @@
interface FileSystemDirectoryEntry : FileSystemEntry {
FileSystemDirectoryReader createReader();
void getFile(DOMString? path,
void getFile(optional USVString? path,
optional FileSystemFlags options,
optional FileSystemEntryCallback successCallback,
optional ErrorCallback errorCallback);
void getDirectory(DOMString? path,
void getDirectory(optional USVString? path,
optional FileSystemFlags options,
optional FileSystemEntryCallback successCallback,
optional ErrorCallback errorCallback);

View File

@ -9,25 +9,14 @@ interface FileSystemEntry {
readonly attribute boolean isDirectory;
[GetterThrows]
readonly attribute DOMString name;
readonly attribute USVString name;
[GetterThrows]
readonly attribute DOMString fullPath;
readonly attribute USVString fullPath;
readonly attribute FileSystem filesystem;
/** Not implemented:
* void getMetadata(MetadataCallback successCallback,
* optional ErrorCallback errorCallback);
* void moveTo(FileSystemDirectoryEntry parent, optional DOMString? name,
* optional FileSystemEntryCallback successCallback,
* optional ErrorCallback errorCallback);
* void copyTo(FileSystemDirectoryEntry parent, optional DOMString? name,
* optional FileSystemEntryCallback successCallback,
* optional ErrorCallback errorCallback);
* DOMString toURL();
* void remove(VoidCallback successCallback,
* optional ErrorCallback errorCallback);
* void getParent(optional FileSystemEntryCallback successCallback,
* optional ErrorCallback errorCallback);
*/