From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- layout/style/SheetLoadData.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'layout/style/SheetLoadData.h') diff --git a/layout/style/SheetLoadData.h b/layout/style/SheetLoadData.h index c817e4c1f3..6621af35bd 100644 --- a/layout/style/SheetLoadData.h +++ b/layout/style/SheetLoadData.h @@ -90,7 +90,9 @@ class SheetLoadData final // so aBytes1 and aBytes2 refer to those pieces. nsresult VerifySheetReadyToParse(nsresult aStatus, const nsACString& aBytes1, const nsACString& aBytes2, - nsIChannel* aChannel); + nsIChannel* aChannel, + nsIURI* aFinalChannelURI, + nsIPrincipal* aPrincipal); NS_DECL_ISUPPORTS @@ -237,6 +239,8 @@ class SheetLoadData final // listening for the load. bool mIntentionallyDropped = false; + const bool mRecordErrors; + bool ShouldDefer() const { return mWasAlternate || !mMediaMatched; } RefPtr ValueForCache() const; -- cgit v1.2.3