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

Bug 1638396 - Extract CreateFileBlobImpl function. r=dom-workers-and-storage-reviewers,janv

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D75814
This commit is contained in:
Simon Giesecke 2020-07-01 09:03:50 +00:00
parent ba6bebfde8
commit a8060d7e44
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
dom/indexedDB/ActorsParent.cpp
View File

@ -9129,6 +9129,18 @@ bool GetFilenameBase(const nsAString& aFilename, const nsAString& aSuffix,
return true;
}
RefPtr<BlobImpl> CreateFileBlobImpl(const Database& aDatabase,
const nsCOMPtr<nsIFile>& aNativeFile,
const FileInfo::IdType aId) {
// XXX aDatabase isn't used right now, but in a subsequent change this should
// possibly create an EncryptedFileBlobImpl, and we need the Database to
// decide that.
auto impl = MakeRefPtr<FileBlobImpl>(aNativeFile);
impl->SetFileId(aId);
return impl;
}
mozilla::Result<nsTArray<SerializedStructuredCloneFile>, nsresult>
SerializeStructuredCloneFiles(PBackgroundParent* aBackgroundActor,
const SafeRefPtr<Database>& aDatabase,
@ -9175,9 +9187,17 @@ SerializeStructuredCloneFiles(PBackgroundParent* aBackgroundActor,
}
switch (file.Type()) {
case StructuredCloneFileBase::eStructuredClone:
if (!aForPreprocess) {
return SerializedStructuredCloneFile{
null_t(), StructuredCloneFileBase::eStructuredClone};
}
[[fallthrough]];
case StructuredCloneFileBase::eBlob: {
RefPtr<FileBlobImpl> impl = new FileBlobImpl(nativeFile);
impl->SetFileId(file.FileInfo().Id());
auto impl = CreateFileBlobImpl(*aDatabase, nativeFile,
file.FileInfo().Id());
IPCBlob ipcBlob;
nsresult rv =
@ -9190,8 +9210,7 @@ SerializeStructuredCloneFiles(PBackgroundParent* aBackgroundActor,
aDatabase->MapBlob(ipcBlob, file.FileInfoPtr());
return SerializedStructuredCloneFile{
ipcBlob, StructuredCloneFileBase::eBlob};
return SerializedStructuredCloneFile{ipcBlob, file.Type()};
}
case StructuredCloneFileBase::eMutableFile: {
@ -9221,30 +9240,6 @@ SerializeStructuredCloneFiles(PBackgroundParent* aBackgroundActor,
actor.get(), StructuredCloneFileBase::eMutableFile};
}
case StructuredCloneFileBase::eStructuredClone: {
if (!aForPreprocess) {
return SerializedStructuredCloneFile{
null_t(), StructuredCloneFileBase::eStructuredClone};
}
RefPtr<FileBlobImpl> impl = new FileBlobImpl(nativeFile);
impl->SetFileId(file.FileInfo().Id());
IPCBlob ipcBlob;
nsresult rv =
IPCBlobUtils::Serialize(impl, aBackgroundActor, ipcBlob);
if (NS_WARN_IF(NS_FAILED(rv))) {
// This can only fail if the child has crashed.
IDB_REPORT_INTERNAL_ERR();
return Err(NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
}
aDatabase->MapBlob(ipcBlob, file.FileInfoPtr());
return SerializedStructuredCloneFile{
ipcBlob, StructuredCloneFileBase::eStructuredClone};
}
case StructuredCloneFileBase::eWasmBytecode:
case StructuredCloneFileBase::eWasmCompiled: {
// Set file() to null, support for storing WebAssembly.Modules has
@ -20018,6 +20013,7 @@ already_AddRefed<nsISupports> MutableFile::CreateStream(bool aReadOnly) {
already_AddRefed<BlobImpl> MutableFile::CreateBlobImpl() {
AssertIsOnBackgroundThread();
// This doesn't use CreateFileBlobImpl as mutable files cannot be encrypted.
auto blobImpl = MakeRefPtr<FileBlobImpl>(mFile);
blobImpl->SetFileId(mFileInfo->Id());

5
dom/indexedDB/FileInfoT.h
View File

@ -19,6 +19,7 @@ template <typename FileManager>
class FileInfoT final {
public:
using AutoLock = typename FileManager::AutoLock;
using IdType = int64_t;
FileInfoT(const typename FileManager::FileManagerGuard& aGuard,
SafeRefPtr<FileManager> aFileManager, const int64_t aFileId,
@ -33,7 +34,7 @@ class FileInfoT final {
FileManager& Manager() const;
int64_t Id() const;
IdType Id() const;
nsCOMPtr<nsIFile> GetFileForFileInfo() const;
@ -45,7 +46,7 @@ class FileInfoT final {
void Cleanup();
const int64_t mFileId;
const IdType mFileId;
ThreadSafeAutoRefCnt mRefCnt;
ThreadSafeAutoRefCnt mDBRefCnt;