corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 07a3a86e82ee (bug 1871498) for causing multiple leakcheck failures CLOSED TREE

Browse Source
This commit is contained in:
Norisz Fay
2024-01-25 18:35:45 +02:00
parent d98efdddab
commit cbb0667a13
2 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dom/fetch/FetchDriver.cpp
View File

@@ -970,7 +970,6 @@ void FetchDriver::FailWithNetworkError(nsresult rv) {
// mObserver could be null after OnResponseAvailable(). // mObserver could be null after OnResponseAvailable().
if (mObserver) { if (mObserver) {
mObserver->OnReportPerformanceTiming();
mObserver->OnResponseEnd(FetchDriverObserver::eByNetworking, mObserver->OnResponseEnd(FetchDriverObserver::eByNetworking,
JS::UndefinedHandleValue); JS::UndefinedHandleValue);
mObserver = nullptr; mObserver = nullptr;

34
dom/fetch/FetchService.cpp
View File

@@ -256,13 +256,8 @@ void FetchService::FetchInstance::Cancel() {
FETCH_LOG(("FetchInstance::Cancel() [%p]", this)); FETCH_LOG(("FetchInstance::Cancel() [%p]", this));
// If mFetchDriver is not null here, FetchInstance::Fetch() has already
// started, let mFetchDriver::RunAbortAlgorithm() to call
// FetchInstance::OnResponseEnd() to resolve the pending promises.
// Otherwise, resolving the pending promises here.
if (mFetchDriver) { if (mFetchDriver) {
mFetchDriver->RunAbortAlgorithm(); mFetchDriver->RunAbortAlgorithm();
return;
} }
MOZ_ASSERT(mPromises); MOZ_ASSERT(mPromises);
@@ -299,28 +294,18 @@ void FetchService::FetchInstance::OnResponseEnd(
MOZ_ASSERT(mPromises); MOZ_ASSERT(mPromises);
if (aReason == eAborted) { // If ResponseTimingPromise is not resolved, it means the fetch is aborted.
// If ResponseAvailablePromise has not resolved yet, resolved with // Resolving ResponseTimingPromise with an emtpy ResponseTiming.
// NS_ERROR_DOM_ABORT_ERR response. if (!mPromises->GetResponseTimingPromise()->IsResolved()) {
if (!mPromises->GetResponseAvailablePromise()->IsResolved()) { mPromises->ResolveResponseTimingPromise(ResponseTiming(), __func__);
mPromises->ResolveResponseAvailablePromise(
InternalResponse::NetworkError(NS_ERROR_DOM_ABORT_ERR), __func__);
}
// If ResponseTimingPromise has not resolved yet, resolved with empty
// ResponseTiming.
if (!mPromises->GetResponseTimingPromise()->IsResolved()) {
mPromises->ResolveResponseTimingPromise(ResponseTiming(), __func__);
}
return;
} }
MOZ_ASSERT(mPromises->GetResponseAvailablePromise()->IsResolved() &&
mPromises->GetResponseTimingPromise()->IsResolved());
// Resolve the ResponseEndPromise // Resolve the ResponseEndPromise
mPromises->ResolveResponseEndPromise(ResponseEndArgs(aReason), __func__); mPromises->ResolveResponseEndPromise(ResponseEndArgs(aReason), __func__);
if (aReason == eAborted) {
return;
}
// Remove the FetchInstance from FetchInstanceTable // Remove the FetchInstance from FetchInstanceTable
RefPtr<FetchService> fetchService = FetchService::GetInstance(); RefPtr<FetchService> fetchService = FetchService::GetInstance();
MOZ_ASSERT(fetchService); MOZ_ASSERT(fetchService);
@@ -429,10 +414,7 @@ void FetchService::FetchInstance::OnReportPerformanceTiming() {
UniquePtr<PerformanceTimingData> performanceTiming( UniquePtr<PerformanceTimingData> performanceTiming(
mFetchDriver->GetPerformanceTimingData(timing.initiatorType(), mFetchDriver->GetPerformanceTimingData(timing.initiatorType(),
timing.entryName())); timing.entryName()));
// FetchDriver has no corresponding performance timing when fetch() failed.
// Resolve the ResponseTimingPromise with empty timing.
if (!performanceTiming) { if (!performanceTiming) {
mPromises->ResolveResponseTimingPromise(ResponseTiming(), __func__);
return; return;
} }
timing.timingData() = performanceTiming->ToIPC(); timing.timingData() = performanceTiming->ToIPC();