From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:27 +0200 Subject: Adding upstream version 125.0.1. Signed-off-by: Daniel Baumann --- dom/file/uri/BlobURLInputStream.cpp | 7 ++++--- dom/file/uri/BlobURLProtocolHandler.cpp | 7 +++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'dom/file/uri') diff --git a/dom/file/uri/BlobURLInputStream.cpp b/dom/file/uri/BlobURLInputStream.cpp index 34a1bb63e8..41259baa82 100644 --- a/dom/file/uri/BlobURLInputStream.cpp +++ b/dom/file/uri/BlobURLInputStream.cpp @@ -12,6 +12,7 @@ #include "mozilla/ScopeExit.h" #include "mozilla/dom/ContentChild.h" #include "mozilla/dom/IPCBlobUtils.h" +#include "mozilla/net/ContentRange.h" #include "nsStreamUtils.h" #include "nsMimeTypes.h" @@ -488,9 +489,9 @@ nsresult BlobURLInputStream::StoreBlobImplStream( // If a Range header was in the request then fetch/XHR will have set a // ContentRange on the channel earlier so we may slice the blob now. blobImpl->GetType(blobContentType); - const Maybe& contentRange = - mChannel->GetContentRange(); - if (contentRange.isSome()) { + const RefPtr& contentRange = + mChannel->ContentRange(); + if (contentRange) { IgnoredErrorResult result; uint64_t start = contentRange->Start(); uint64_t end = contentRange->End(); diff --git a/dom/file/uri/BlobURLProtocolHandler.cpp b/dom/file/uri/BlobURLProtocolHandler.cpp index 3e2d8e788e..978e88cc8b 100644 --- a/dom/file/uri/BlobURLProtocolHandler.cpp +++ b/dom/file/uri/BlobURLProtocolHandler.cpp @@ -948,7 +948,7 @@ nsresult NS_GetBlobForBlobURISpec(const nsACString& aSpec, } // Blob requests may specify a range header. We parse, validate, and -// store that info here, and save it on the nsBaseChannel, where it +// store that info here, and save it on the nsIBaseChannel, where it // can be accessed by BlobURLInputStream::StoreBlobImplStream. nsresult NS_SetChannelContentRangeForBlobURI(nsIChannel* aChannel, nsIURI* aURI, nsACString& aRangeHeader) { @@ -963,9 +963,8 @@ nsresult NS_SetChannelContentRangeForBlobURI(nsIChannel* aChannel, nsIURI* aURI, if (result.Failed()) { return NS_ERROR_NO_CONTENT; } - nsBaseChannel* bchan = static_cast(aChannel); - MOZ_ASSERT(bchan); - if (!bchan->SetContentRange(aRangeHeader, size)) { + nsCOMPtr baseChan = do_QueryInterface(aChannel); + if (!baseChan || !baseChan->SetContentRangeFromHeader(aRangeHeader, size)) { return NS_ERROR_NET_PARTIAL_TRANSFER; } return NS_OK; -- cgit v1.2.3