Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1662119 - Replace MOZ_TRY with IDB_TRY; r=dom-workers-and-storage-reviewers,sg

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D88832
This commit is contained in:
Jan Varga 2020-09-07 12:24:50 +00:00
parent 8d21f4598d
commit 0acd64c691
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dom/indexedDB/ActorsParent.cpp
View File

@ -16336,9 +16336,7 @@ nsresult FileManager::Init(nsIFile* aDirectory,
std::mem_fn(&mozIStorageConnection::CreateStatement),
aConnection, "SELECT id, refcount FROM file"_ns));
// XXX gcc doesn't like multiple IDB_TRY_VAR within a macro, so can't use
// MOZ_TRY directly here.
auto res = CollectWhile(
IDB_TRY(CollectWhile(
[&stmt]() -> Result<bool, nsresult> {
IDB_TRY_VAR(auto hasResult, MOZ_TO_RESULT_INVOKE(stmt, ExecuteStep));
return hasResult;
@ -16359,8 +16357,7 @@ nsresult FileManager::Init(nsIFile* aDirectory,
mLastFileId = std::max(id, mLastFileId);
return mozilla::Ok{};
});
MOZ_TRY(std::move(res));
}));
return NS_OK;
}
@ -16509,7 +16506,7 @@ nsresult FileManager::InitDirectory(nsIFile& aDirectory, nsIFile& aDatabaseFile,
bool hasJournals = false;
MOZ_TRY(CollectEach(
IDB_TRY(CollectEach(
[&entries]() -> Result<nsCOMPtr<nsIFile>, nsresult> {
IDB_TRY_VAR(
auto file,
@ -16564,9 +16561,7 @@ nsresult FileManager::InitDirectory(nsIFile& aDirectory, nsIFile& aDatabaseFile,
IDB_TRY(stmt->BindStringByIndex(0, path));
// XXX gcc doesn't like multiple IDB_TRY_VAR within a macro, so can't use
// MOZ_TRY directly here.
auto res = CollectWhile(
IDB_TRY(CollectWhile(
[&stmt]() -> Result<bool, nsresult> {
IDB_TRY_VAR(auto hasResult,
MOZ_TO_RESULT_INVOKE(stmt, ExecuteStep));
@ -16608,8 +16603,7 @@ nsresult FileManager::InitDirectory(nsIFile& aDirectory, nsIFile& aDatabaseFile,
}
return mozilla::Ok{};
});
MOZ_TRY(std::move(res));
}));
IDB_TRY(connection->ExecuteSimpleSQL("DROP TABLE fs;"_ns));
IDB_TRY(transaction.Commit());
@ -16636,8 +16630,7 @@ Result<FileUsageType, nsresult> FileManager::GetUsage(nsIFile* aDirectory) {
FileUsageType usage;
nsCOMPtr<nsIFile> file;
MOZ_TRY(CollectEach(
IDB_TRY(CollectEach(
[&entries]() -> Result<nsCOMPtr<nsIFile>, nsresult> {
IDB_TRY_VAR(
auto file,