corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset c32c74847eb6 (bug 1335539)

Browse Source
This commit is contained in:
Sebastian Hengst
2017-02-21 17:53:45 +01:00
parent 5fbfcd2a99
commit 0dd56967f5
35 changed files with 208 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dom/file/FileCreatorHelper.cpp
View File

@@ -82,8 +82,7 @@ FileCreatorHelper::CreateFileInternal(nsPIDOMWindowInner* aWindow,
RefPtr<BlobImpl> blobImpl;
aRv = CreateBlobImpl(aFile, aBag.mType, aBag.mName, lastModifiedPassed,
lastModified, aBag.mExistenceCheck, aIsFromNsIFile,
getter_AddRefs(blobImpl));
lastModified, aIsFromNsIFile, getter_AddRefs(blobImpl));
if (aRv.Failed()) {
return nullptr;
}
@@ -131,8 +130,7 @@ FileCreatorHelper::SendRequest(nsIFile* aFile,
}
cc->FileCreationRequest(uuid, this, path, aBag.mType, aBag.mName,
aBag.mLastModified, aBag.mExistenceCheck,
aIsFromNsIFile);
aBag.mLastModified, aIsFromNsIFile);
}
void
@@ -153,7 +151,6 @@ FileCreatorHelper::CreateBlobImplForIPC(const nsAString& aPath,
const nsAString& aName,
bool aLastModifiedPassed,
int64_t aLastModified,
bool aExistenceCheck,
bool aIsFromNsIFile,
BlobImpl** aBlobImpl)
{
@@ -164,7 +161,7 @@ FileCreatorHelper::CreateBlobImplForIPC(const nsAString& aPath,
}
return CreateBlobImpl(file, aType, aName, aLastModifiedPassed, aLastModified,
aExistenceCheck, aIsFromNsIFile, aBlobImpl);
aIsFromNsIFile, aBlobImpl);
}
/* static */ nsresult
@@ -173,29 +170,9 @@ FileCreatorHelper::CreateBlobImpl(nsIFile* aFile,
const nsAString& aName,
bool aLastModifiedPassed,
int64_t aLastModified,
bool aExistenceCheck,
bool aIsFromNsIFile,
BlobImpl** aBlobImpl)
{
if (!aExistenceCheck) {
RefPtr<FileBlobImpl> impl = new FileBlobImpl(aFile);
if (!aName.IsEmpty()) {
impl->SetName(aName);
}
if (!aType.IsEmpty()) {
impl->SetType(aType);
}
if (aLastModifiedPassed) {
impl->SetLastModified(aLastModified);
}
impl.forget(aBlobImpl);
return NS_OK;
}
RefPtr<MultipartBlobImpl> impl = new MultipartBlobImpl(EmptyString());
nsresult rv =
impl->InitializeChromeFile(aFile, aType, aName, aLastModifiedPassed,