diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /dom/file | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/file')
| -rw-r--r-- | dom/file/ipc/RemoteLazyInputStreamThread.cpp | 2 | ||||
| -rw-r--r-- | dom/file/uri/BlobURLProtocolHandler.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/dom/file/ipc/RemoteLazyInputStreamThread.cpp b/dom/file/ipc/RemoteLazyInputStreamThread.cpp index 5883c44d4c..67f670ac4a 100644 --- a/dom/file/ipc/RemoteLazyInputStreamThread.cpp +++ b/dom/file/ipc/RemoteLazyInputStreamThread.cpp @@ -151,7 +151,7 @@ RemoteLazyInputStreamThread::Dispatch(already_AddRefed<nsIRunnable> aRunnable, if (RLISThreadIsInOrBeyondShutdown()) { // nsIEventTarget::Dispatch must leak the runnable if the dispatch fails. - (void)runnable.forget(); + Unused << runnable.forget(); return NS_ERROR_ILLEGAL_DURING_SHUTDOWN; } diff --git a/dom/file/uri/BlobURLProtocolHandler.cpp b/dom/file/uri/BlobURLProtocolHandler.cpp index 978e88cc8b..9c27ece1d1 100644 --- a/dom/file/uri/BlobURLProtocolHandler.cpp +++ b/dom/file/uri/BlobURLProtocolHandler.cpp @@ -16,7 +16,6 @@ #include "mozilla/dom/IPCBlobUtils.h" #include "mozilla/dom/MediaSource.h" #include "mozilla/ipc/IPCStreamUtils.h" -#include "mozilla/glean/GleanMetrics.h" #include "mozilla/AppShutdown.h" #include "mozilla/BasePrincipal.h" #include "mozilla/LoadInfo.h" @@ -777,7 +776,6 @@ bool BlobURLProtocolHandler::GetDataEntry( if (StaticPrefs::privacy_partition_bloburl_per_partition_key() && !aPartitionKey.IsEmpty() && !info->mPartitionKey.IsEmpty() && !aPartitionKey.Equals(info->mPartitionKey)) { - mozilla::glean::bloburl::resolve_stopped.Add(); nsAutoString localizedMsg; AutoTArray<nsString, 1> param; CopyUTF8toUTF16(aUri, *param.AppendElement()); |