wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-24 16:17:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

[network] BackgroundFileSaver cleanup.

Browse source
This commit is contained in:
Randell Jesup 2022-02-10 22:51:15 +00:00 • committed by roytam1
commit 562b04e5c0
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
netwerk/base/BackgroundFileSaver.cpp
View file

@ -247,7 +247,8 @@ BackgroundFileSaver::EnableSha256()
nsresult rv; nsresult rv;
nsCOMPtr<nsISupports> nssDummy = do_GetService("@mozilla.org/psm;1", &rv); nsCOMPtr<nsISupports> nssDummy = do_GetService("@mozilla.org/psm;1", &rv);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
mSha256Enabled = true; MutexAutoLock lock(mLock);
mSha256Enabled = true; // this will be read by the worker thread
return NS_OK; return NS_OK;
} }
@ -273,6 +274,7 @@ BackgroundFileSaver::EnableSignatureInfo()
nsresult rv; nsresult rv;
nsCOMPtr<nsISupports> nssDummy = do_GetService("@mozilla.org/psm;1", &rv); nsCOMPtr<nsISupports> nssDummy = do_GetService("@mozilla.org/psm;1", &rv);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
MutexAutoLock lock(mLock);
mSignatureInfoEnabled = true; mSignatureInfoEnabled = true;
return NS_OK; return NS_OK;
} }
@ -386,9 +388,17 @@ BackgroundFileSaver::ProcessAttention()
// If mAsyncCopyContext is not null, we interrupt the copy and re-enter // If mAsyncCopyContext is not null, we interrupt the copy and re-enter
// through AsyncCopyCallback. This allows us to check if, for instance, we // through AsyncCopyCallback. This allows us to check if, for instance, we
// should rename the target file. We will then restart the copy if needed. // should rename the target file. We will then restart the copy if needed.
if (mAsyncCopyContext) {
NS_CancelAsyncCopy(mAsyncCopyContext, NS_ERROR_ABORT); // mAsyncCopyContext is only written on the worker thread (which we are on)
return NS_OK; MOZ_ASSERT(!NS_IsMainThread());
{
// Even though we're the only thread that writes this, we have to take the
// lock
MutexAutoLock lock(mLock);
if (mAsyncCopyContext) {
NS_CancelAsyncCopy(mAsyncCopyContext, NS_ERROR_ABORT);
return NS_OK;
}
} }
// Use the current shared state to determine the next operation to execute. // Use the current shared state to determine the next operation to execute.
rv = ProcessStateChange(); rv = ProcessStateChange();
@ -661,12 +671,11 @@ BackgroundFileSaver::CheckCompletion()
{ {
nsresult rv; nsresult rv;
MOZ_ASSERT(!mAsyncCopyContext,
"Should not be copying when checking completion conditions.");
bool failed = true; bool failed = true;
{ {
MutexAutoLock lock(mLock); MutexAutoLock lock(mLock);
MOZ_ASSERT(!mAsyncCopyContext,
"Should not be copying when checking completion conditions.");
if (mComplete) { if (mComplete) {
return true; return true;