Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 7 insertions, 6 deletions

diff --git a/dom/fetch/FetchService.cpp b/dom/fetch/FetchService.cpp
index 77decbc56f..9af967d6af 100644
--- a/dom/fetch/FetchService.cpp
+++ b/dom/fetch/FetchService.cpp
@@ -65,42 +65,42 @@ FetchServicePromises::GetResponseEndPromise() {
 }
 
 void FetchServicePromises::ResolveResponseAvailablePromise(
-    FetchServiceResponse&& aResponse, const char* aMethodName) {
+    FetchServiceResponse&& aResponse, StaticString aMethodName) {
   if (mAvailablePromise) {
     mAvailablePromise->Resolve(std::move(aResponse), aMethodName);
   }
 }
 
 void FetchServicePromises::RejectResponseAvailablePromise(
-    const CopyableErrorResult&& aError, const char* aMethodName) {
+    const CopyableErrorResult&& aError, StaticString aMethodName) {
   if (mAvailablePromise) {
     mAvailablePromise->Reject(aError, aMethodName);
   }
 }
 
 void FetchServicePromises::ResolveResponseTimingPromise(
-    ResponseTiming&& aTiming, const char* aMethodName) {
+    ResponseTiming&& aTiming, StaticString aMethodName) {
   if (mTimingPromise) {
     mTimingPromise->Resolve(std::move(aTiming), aMethodName);
   }
 }
 
 void FetchServicePromises::RejectResponseTimingPromise(
-    const CopyableErrorResult&& aError, const char* aMethodName) {
+    const CopyableErrorResult&& aError, StaticString aMethodName) {
   if (mTimingPromise) {
     mTimingPromise->Reject(aError, aMethodName);
   }
 }
 
 void FetchServicePromises::ResolveResponseEndPromise(ResponseEndArgs&& aArgs,
-                                                     const char* aMethodName) {
+                                                     StaticString aMethodName) {
   if (mEndPromise) {
     mEndPromise->Resolve(std::move(aArgs), aMethodName);
   }
 }
 
 void FetchServicePromises::RejectResponseEndPromise(
-    const CopyableErrorResult&& aError, const char* aMethodName) {
+    const CopyableErrorResult&& aError, StaticString aMethodName) {
   if (mEndPromise) {
     mEndPromise->Reject(aError, aMethodName);
   }
@@ -229,6 +229,7 @@ RefPtr<FetchServicePromises> FetchService::FetchInstance::Fetch() {
     }
     mFetchDriver->SetAssociatedBrowsingContextID(
         args.mAssociatedBrowsingContextID);
+    mFetchDriver->SetIsThirdPartyWorker(Some(args.mIsThirdPartyContext));
   }
 
   mFetchDriver->EnableNetworkInterceptControl();