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

Bug 1617170 - Change signature of FileInfo::GetFileForFileInfo to accept const& instead of raw pointer. r=dom-workers-and-storage-reviewers,janv

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D63680

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Simon Giesecke 2020-03-02 16:18:05 +00:00
parent 546c431429
commit 19d8a4b711
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/indexedDB/ActorsParent.cpp
View File

@ -19273,7 +19273,7 @@ nsresult DatabaseOperationBase::GetStructuredCloneReadInfoFromExternalBlob(
MOZ_ASSERT(file.mType == StructuredCloneFile::eStructuredClone);
const nsCOMPtr<nsIFile> nativeFile =
FileInfo::GetFileForFileInfo(file.mFileInfo);
FileInfo::GetFileForFileInfo(*file.mFileInfo);
if (NS_WARN_IF(!nativeFile)) {
return NS_ERROR_FAILURE;
}
@ -23287,7 +23287,7 @@ CreateFileOp::CreateFileOp(Database* aDatabase,
}
nsresult CreateFileOp::CreateMutableFile(RefPtr<MutableFile>* aMutableFile) {
nsCOMPtr<nsIFile> file = FileInfo::GetFileForFileInfo(*mFileInfo);
nsCOMPtr<nsIFile> file = FileInfo::GetFileForFileInfo(**mFileInfo);
if (NS_WARN_IF(!file)) {
IDB_REPORT_INTERNAL_ERR();
return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;

7
dom/indexedDB/FileInfo.cpp
View File

@ -127,15 +127,14 @@ void FileInfo::Cleanup() {
}
/* static */
nsCOMPtr<nsIFile> FileInfo::GetFileForFileInfo(FileInfo* aFileInfo) {
FileManager* const fileManager = aFileInfo->Manager();
nsCOMPtr<nsIFile> FileInfo::GetFileForFileInfo(const FileInfo& aFileInfo) {
FileManager* const fileManager = aFileInfo.Manager();
const nsCOMPtr<nsIFile> directory = fileManager->GetDirectory();
if (NS_WARN_IF(!directory)) {
return nullptr;
}
nsCOMPtr<nsIFile> file =
FileManager::GetFileForId(directory, aFileInfo->Id());
nsCOMPtr<nsIFile> file = FileManager::GetFileForId(directory, aFileInfo.Id());
if (NS_WARN_IF(!file)) {
return nullptr;
}

2
dom/indexedDB/FileInfo.h
View File

@ -57,7 +57,7 @@ class FileInfo final {
int64_t Id() const { return mFileId; }
static nsCOMPtr<nsIFile> GetFileForFileInfo(FileInfo* aFileInfo);
static nsCOMPtr<nsIFile> GetFileForFileInfo(const FileInfo& aFileInfo);
private:
void UpdateReferences(

2
dom/indexedDB/IDBObjectStore.cpp
View File

@ -653,7 +653,7 @@ class ValueDeserializationHelper {
if (!blob) {
MOZ_ASSERT(aFile.mFileInfo);
const nsCOMPtr<nsIFile> file =
FileInfo::GetFileForFileInfo(aFile.mFileInfo);
FileInfo::GetFileForFileInfo(*aFile.mFileInfo);
if (!file) {
return false;
}