Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1360340 - IPCBlob must contain isDirectory boolean in order to support Drag&Drop of directories, r=smaug

Browse Source
This commit is contained in:
Andrea Marchesini 2017-05-02 16:38:19 +02:00
parent 37a5962246
commit 9cc9f87380
4 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/file/StreamBlobImpl.cpp
View File

@ -42,6 +42,7 @@ StreamBlobImpl::StreamBlobImpl(nsIInputStream* aInputStream,
uint64_t aLength)
: BaseBlobImpl(aContentType, aLength)
, mInputStream(aInputStream)
, mIsDirectory(false)
{
mImmutable = true;
}
@ -51,6 +52,7 @@ StreamBlobImpl::StreamBlobImpl(StreamBlobImpl* aOther,
uint64_t aStart, uint64_t aLength)
: BaseBlobImpl(aContentType, aOther->mStart + aStart, aLength)
, mInputStream(new SlicedInputStream(aOther->mInputStream, aStart, aLength))
, mIsDirectory(false)
{
mImmutable = true;
}
@ -62,6 +64,7 @@ StreamBlobImpl::StreamBlobImpl(nsIInputStream* aInputStream,
uint64_t aLength)
: BaseBlobImpl(aName, aContentType, aLength, aLastModifiedDate)
, mInputStream(aInputStream)
, mIsDirectory(false)
{
mImmutable = true;
}

24
dom/file/StreamBlobImpl.h
View File

@ -46,6 +46,27 @@ public:
return true;
}
void SetFullPath(const nsAString& aFullPath)
{
mFullPath = aFullPath;
}
void GetMozFullPathInternal(nsAString& aFullPath,
ErrorResult& aRv) const override
{
aFullPath = mFullPath;
}
void SetIsDirectory(bool aIsDirectory)
{
mIsDirectory = aIsDirectory;
}
bool IsDirectory() const override
{
return mIsDirectory;
}
private:
StreamBlobImpl(nsIInputStream* aInputStream,
const nsAString& aContentType,
@ -67,6 +88,9 @@ private:
void MaybeRegisterMemoryReporter();
nsCOMPtr<nsIInputStream> mInputStream;
nsString mFullPath;
bool mIsDirectory;
};
} // namespace dom

4
dom/file/ipc/IPCBlob.ipdlh
View File

@ -24,6 +24,10 @@ struct IPCFile
nsString name;
int64_t lastModified;
nsString DOMPath;
nsString fullPath;
// Useful for Entries API.
bool isDirectory;
};
// Union for blob vs file.

12
dom/file/ipc/IPCBlobUtils.cpp
View File

@ -47,7 +47,7 @@ Deserialize(const IPCBlob& aIPCBlob)
MOZ_ASSERT(inputStream);
RefPtr<BlobImpl> blobImpl;
RefPtr<StreamBlobImpl> blobImpl;
if (aIPCBlob.file().type() == IPCFileUnion::Tvoid_t) {
blobImpl = StreamBlobImpl::Create(inputStream,
@ -61,6 +61,8 @@ Deserialize(const IPCBlob& aIPCBlob)
file.lastModified(),
aIPCBlob.size());
blobImpl->SetDOMPath(file.DOMPath());
blobImpl->SetFullPath(file.fullPath());
blobImpl->SetIsDirectory(file.isDirectory());
}
return blobImpl.forget();
@ -165,6 +167,14 @@ SerializeInternal(BlobImpl* aBlobImpl, M* aManager, IPCBlob& aIPCBlob)
aBlobImpl->GetDOMPath(value);
file.DOMPath() = value;
aBlobImpl->GetMozFullPathInternal(value, rv);
if (NS_WARN_IF(rv.Failed())) {
return rv.StealNSResult();
}
file.fullPath() = value;
file.isDirectory() = aBlobImpl->IsDirectory();
aIPCBlob.file() = file;
}