Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1671369 - Change LockedDirectoryPaddingGet to return a Result and use CACHE_TRY. r=dom-workers-and-storage-reviewers,ttung

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D93775
This commit is contained in:
Simon Giesecke 2020-11-17 09:07:03 +00:00
parent a52d798cb2
commit dec6e1d21c
3 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dom/cache/FileUtils.cpp vendored
View File

@ -26,6 +26,7 @@
namespace mozilla::dom::cache {
using mozilla::dom::quota::Client;
using mozilla::dom::quota::CloneFileAndAppend;
using mozilla::dom::quota::FileInputStream;
using mozilla::dom::quota::FileOutputStream;
using mozilla::dom::quota::PERSISTENCE_TYPE_DEFAULT;
@ -780,50 +781,40 @@ bool DirectoryPaddingFileExists(nsIFile* aBaseDir,
return exists;
}
// static
nsresult LockedDirectoryPaddingGet(nsIFile* aBaseDir,
int64_t* aPaddingSizeOut) {
MOZ_DIAGNOSTIC_ASSERT(aBaseDir);
MOZ_DIAGNOSTIC_ASSERT(aPaddingSizeOut);
CACHE_TRY_INSPECT(const int64_t& paddingSize,
LockedDirectoryPaddingGet(*aBaseDir));
*aPaddingSizeOut = paddingSize;
return NS_OK;
}
Result<int64_t, nsresult> LockedDirectoryPaddingGet(nsIFile& aBaseDir) {
MOZ_DIAGNOSTIC_ASSERT(
!DirectoryPaddingFileExists(aBaseDir, DirPaddingFile::TMP_FILE));
!DirectoryPaddingFileExists(&aBaseDir, DirPaddingFile::TMP_FILE));
nsCOMPtr<nsIFile> file;
nsresult rv = aBaseDir->Clone(getter_AddRefs(file));
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
rv = file->Append(nsLiteralString(PADDING_FILE_NAME));
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
CACHE_TRY_INSPECT(
const auto& file,
CloneFileAndAppend(aBaseDir, nsLiteralString(PADDING_FILE_NAME)));
nsCOMPtr<nsIInputStream> stream;
rv = NS_NewLocalFileInputStream(getter_AddRefs(stream), file);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
CACHE_TRY(NS_NewLocalFileInputStream(getter_AddRefs(stream), file));
nsCOMPtr<nsIInputStream> bufferedStream;
rv = NS_NewBufferedInputStream(getter_AddRefs(bufferedStream),
stream.forget(), 512);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
CACHE_TRY(NS_NewBufferedInputStream(getter_AddRefs(bufferedStream),
stream.forget(), 512));
nsCOMPtr<nsIObjectInputStream> objectStream =
NS_NewObjectInputStream(bufferedStream);
uint64_t paddingSize = 0;
rv = objectStream->Read64(&paddingSize);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
*aPaddingSizeOut = paddingSize;
return rv;
CACHE_TRY_RETURN(
MOZ_TO_RESULT_INVOKE(objectStream, Read64).map([](const uint64_t val) {
return int64_t(val);
}));
}
// static

4
dom/cache/FileUtils.h vendored
View File

@ -102,6 +102,10 @@ bool DirectoryPaddingFileExists(nsIFile* aBaseDir,
*
*/
// Returns a Result with a success value denoting the padding size.
Result<int64_t, nsresult> LockedDirectoryPaddingGet(nsIFile& aBaseDir);
// XXX Remove this overload when migrating the callers to use CACHE_TRY.
nsresult LockedDirectoryPaddingGet(nsIFile* aBaseDir, int64_t* aPaddingSizeOut);
nsresult LockedDirectoryPaddingInit(nsIFile* aBaseDir);

6
dom/cache/QuotaClient.cpp vendored
View File

@ -360,10 +360,8 @@ Result<UsageInfo, nsresult> CacheQuotaClient::GetUsageForOriginInternal(
if (!DirectoryPaddingFileExists(dir, DirPaddingFile::TMP_FILE)) {
const auto& maybePaddingSize = [&dir]() -> Maybe<int64_t> {
CACHE_TRY_RETURN(
ToResultInvoke<int64_t>(LockedDirectoryPaddingGet, dir)
.map(Some<int64_t>),
Nothing{});
CACHE_TRY_RETURN(LockedDirectoryPaddingGet(*dir).map(Some<int64_t>),
Nothing{});
}();
if (maybePaddingSize) {