Merging upstream version 125.0.1.

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

1 files changed, 13 insertions, 11 deletions

diff --git a/image/imgLoader.h b/image/imgLoader.h
index c515506790..7423517925 100644
--- a/image/imgLoader.h
+++ b/image/imgLoader.h
@@ -37,6 +37,7 @@ class imgMemoryReporter;
 namespace mozilla {
 namespace dom {
 class Document;
+enum class FetchPriority : uint8_t;
 }
 }  // namespace mozilla
 
@@ -238,7 +239,8 @@ class imgLoader final : public imgILoader,
       nsLoadFlags aLoadFlags, nsISupports* aCacheKey,
       nsContentPolicyType aContentPolicyType, const nsAString& initiatorType,
       bool aUseUrgentStartForChannel, bool aLinkPreload,
-      uint64_t aEarlyHintPreloaderId, imgRequestProxy** _retval);
+      uint64_t aEarlyHintPreloaderId,
+      mozilla::dom::FetchPriority aFetchPriority, imgRequestProxy** _retval);
 
   [[nodiscard]] nsresult LoadImageWithChannel(
       nsIChannel* channel, imgINotificationObserver* aObserver,
@@ -349,7 +351,8 @@ class imgLoader final : public imgILoader,
                      bool aCanMakeNewChannel, bool* aNewChannelCreated,
                      imgRequestProxy** aProxyRequest,
                      nsIPrincipal* aTriggeringPrincipal, mozilla::CORSMode,
-                     bool aLinkPreload, uint64_t aEarlyHintPreloaderId);
+                     bool aLinkPreload, uint64_t aEarlyHintPreloaderId,
+                     mozilla::dom::FetchPriority aFetchPriority);
 
   bool ValidateRequestWithNewChannel(
       imgRequest* request, nsIURI* aURI, nsIURI* aInitialDocumentURI,
@@ -359,15 +362,14 @@ class imgLoader final : public imgILoader,
       nsLoadFlags aLoadFlags, nsContentPolicyType aContentPolicyType,
       imgRequestProxy** aProxyRequest, nsIPrincipal* aLoadingPrincipal,
       mozilla::CORSMode, bool aLinkPreload, uint64_t aEarlyHintPreloaderId,
-      bool* aNewChannelCreated);
-
-  void NotifyObserversForCachedImage(imgCacheEntry* aEntry, imgRequest* request,
-                                     nsIURI* aURI,
-                                     nsIReferrerInfo* aReferrerInfo,
-                                     mozilla::dom::Document* aLoadingDocument,
-                                     nsIPrincipal* aLoadingPrincipal,
-                                     mozilla::CORSMode,
-                                     uint64_t aEarlyHintPreloaderId);
+      mozilla::dom::FetchPriority aFetchPriority, bool* aNewChannelCreated);
+
+  void NotifyObserversForCachedImage(
+      imgCacheEntry* aEntry, imgRequest* request, nsIURI* aURI,
+      nsIReferrerInfo* aReferrerInfo, mozilla::dom::Document* aLoadingDocument,
+      nsIPrincipal* aTriggeringPrincipal, mozilla::CORSMode,
+      uint64_t aEarlyHintPreloaderId,
+      mozilla::dom::FetchPriority aFetchPriority);
   // aURI may be different from imgRequest's URI in the case of blob URIs, as we
   // can share requests with different URIs.
   nsresult CreateNewProxyForRequest(imgRequest* aRequest, nsIURI* aURI,