diff --git a/dom/fetch/Fetch.cpp b/dom/fetch/Fetch.cpp index 0d5f5178489d..135fa8d7c91f 100644 --- a/dom/fetch/Fetch.cpp +++ b/dom/fetch/Fetch.cpp @@ -1185,7 +1185,7 @@ nsresult ExtractByteStreamFromBody(const fetch::ResponseBodyInit& aBodyInit, template FetchBody::FetchBody(nsIGlobalObject* aOwner) - : mOwner(aOwner), mReadableStreamReader(nullptr), mBodyUsed(false) { + : mOwner(aOwner), mBodyUsed(false) { MOZ_ASSERT(aOwner); if (!NS_IsMainThread()) { @@ -1252,14 +1252,10 @@ void FetchBody::SetBodyUsed(JSContext* aCx, ErrorResult& aRv) { } else { MOZ_ASSERT(mFetchStreamReader); // Let's activate the FetchStreamReader. - RefPtr reader; - mFetchStreamReader->StartConsuming(aCx, mReadableStreamBody, - getter_AddRefs(reader), aRv); + mFetchStreamReader->StartConsuming(aCx, mReadableStreamBody, aRv); if (NS_WARN_IF(aRv.Failed())) { return; } - - mReadableStreamReader = reader.forget(); } } } @@ -1509,8 +1505,6 @@ void FetchBody::LockStream(JSContext* aCx, ReadableStream* aStream, if (aRv.Failed()) { return; } - - mReadableStreamReader = reader; } template void FetchBody::LockStream(JSContext* aCx, @@ -1610,7 +1604,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(EmptyBody, FetchBody) NS_IMPL_CYCLE_COLLECTION_UNLINK(mOwner) NS_IMPL_CYCLE_COLLECTION_UNLINK(mAbortSignalImpl) NS_IMPL_CYCLE_COLLECTION_UNLINK(mFetchStreamReader) - NS_IMPL_CYCLE_COLLECTION_UNLINK(mReadableStreamReader) NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(EmptyBody, @@ -1618,7 +1611,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(EmptyBody, NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOwner) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAbortSignalImpl) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFetchStreamReader) - NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mReadableStreamReader) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(EmptyBody, FetchBody) diff --git a/dom/fetch/Fetch.h b/dom/fetch/Fetch.h index 0e2bfca4e5cb..2212a683254a 100644 --- a/dom/fetch/Fetch.h +++ b/dom/fetch/Fetch.h @@ -217,7 +217,6 @@ class FetchBody : public BodyStreamHolder, public AbortFollower { // This is the Reader used to retrieve data from the body. This needs to be // traversed by subclasses. - RefPtr mReadableStreamReader; RefPtr mFetchStreamReader; explicit FetchBody(nsIGlobalObject* aOwner); diff --git a/dom/fetch/FetchStreamReader.cpp b/dom/fetch/FetchStreamReader.cpp index 57f09487fddb..74736d8056ee 100644 --- a/dom/fetch/FetchStreamReader.cpp +++ b/dom/fetch/FetchStreamReader.cpp @@ -173,7 +173,6 @@ void FetchStreamReader::CloseAndRelease(JSContext* aCx, nsresult aStatus) { // https://fetch.spec.whatwg.org/#body-incrementally-read void FetchStreamReader::StartConsuming(JSContext* aCx, ReadableStream* aStream, - ReadableStreamDefaultReader** aReader, ErrorResult& aRv) { MOZ_DIAGNOSTIC_ASSERT(!mReader); MOZ_DIAGNOSTIC_ASSERT(aStream); @@ -186,7 +185,6 @@ void FetchStreamReader::StartConsuming(JSContext* aCx, ReadableStream* aStream, } mReader = reader; - reader.forget(aReader); mAsyncWaitWorkerRef = mWorkerRef; aRv = mPipeOut->AsyncWait(this, 0, 0, mOwningEventTarget); diff --git a/dom/fetch/FetchStreamReader.h b/dom/fetch/FetchStreamReader.h index 57956a3ced8b..65d94d8cb0e4 100644 --- a/dom/fetch/FetchStreamReader.h +++ b/dom/fetch/FetchStreamReader.h @@ -55,7 +55,7 @@ class FetchStreamReader final : public nsIOutputStreamCallback { void CloseAndRelease(JSContext* aCx, nsresult aStatus); void StartConsuming(JSContext* aCx, ReadableStream* aStream, - ReadableStreamDefaultReader** aReader, ErrorResult& aRv); + ErrorResult& aRv); private: explicit FetchStreamReader(nsIGlobalObject* aGlobal); diff --git a/dom/fetch/Request.cpp b/dom/fetch/Request.cpp index 405694611681..4fcb19b6f7b1 100644 --- a/dom/fetch/Request.cpp +++ b/dom/fetch/Request.cpp @@ -34,18 +34,18 @@ NS_IMPL_RELEASE_INHERITED(Request, FetchBody) NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_CLASS(Request) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(Request, FetchBody) - NS_IMPL_CYCLE_COLLECTION_UNLINK(mReadableStreamReader) NS_IMPL_CYCLE_COLLECTION_UNLINK(mOwner) NS_IMPL_CYCLE_COLLECTION_UNLINK(mHeaders) NS_IMPL_CYCLE_COLLECTION_UNLINK(mSignal) + NS_IMPL_CYCLE_COLLECTION_UNLINK(mFetchStreamReader) NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(Request, FetchBody) - NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mReadableStreamReader) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOwner) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mHeaders) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSignal) + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFetchStreamReader) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Request) diff --git a/dom/fetch/Response.cpp b/dom/fetch/Response.cpp index 0b842d1ef6dd..13904b56a6c1 100644 --- a/dom/fetch/Response.cpp +++ b/dom/fetch/Response.cpp @@ -42,7 +42,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(Response, FetchBody) NS_IMPL_CYCLE_COLLECTION_UNLINK(mHeaders) NS_IMPL_CYCLE_COLLECTION_UNLINK(mSignalImpl) NS_IMPL_CYCLE_COLLECTION_UNLINK(mFetchStreamReader) - NS_IMPL_CYCLE_COLLECTION_UNLINK(mReadableStreamReader) NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER NS_IMPL_CYCLE_COLLECTION_UNLINK_END @@ -51,7 +50,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(Response, FetchBody) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mHeaders) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSignalImpl) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFetchStreamReader) - NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mReadableStreamReader) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(Response, FetchBody)