commit 3394e884c5a49f2fb34e52e4503b0fefbca050c4
parent 59332a010eb378b6656819bc798eb7477d70f2a6
Author: Lando <lando@lando.test>
Date: Mon, 10 Nov 2025 11:39:31 +0000
Bug 1944033: apply code formatting via Lando
# ignore-this-changeset
Diffstat:
5 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/dom/media/mediacontrol/MediaControlUtils.h b/dom/media/mediacontrol/MediaControlUtils.h
@@ -7,7 +7,9 @@
#ifndef DOM_MEDIA_MEDIACONTROL_MEDIACONTROLUTILS_H_
#define DOM_MEDIA_MEDIACONTROL_MEDIACONTROLUTILS_H_
+#include "ImageOps.h"
#include "MediaController.h"
+#include "gfxDrawable.h"
#include "imgIEncoder.h"
#include "imgITools.h"
#include "mozilla/Logging.h"
@@ -15,8 +17,6 @@
#include "mozilla/dom/MediaControllerBinding.h"
#include "nsReadableUtils.h"
#include "nsServiceManagerUtils.h"
-#include "gfxDrawable.h"
-#include "ImageOps.h"
extern mozilla::LazyLogModule gMediaControlLog;
@@ -107,10 +107,9 @@ inline nsresult GetEncodedImageBuffer(gfx::DataSourceSurface* aSurface,
return NS_ERROR_FAILURE;
}
- RefPtr<gfxDrawable> drawable = new gfxSurfaceDrawable(
- aSurface, aSurface->GetSize());
- nsCOMPtr<imgIContainer> image =
- image::ImageOps::CreateFromDrawable(drawable);
+ RefPtr<gfxDrawable> drawable =
+ new gfxSurfaceDrawable(aSurface, aSurface->GetSize());
+ nsCOMPtr<imgIContainer> image = image::ImageOps::CreateFromDrawable(drawable);
nsCOMPtr<nsIInputStream> inputStream;
nsresult rv = imgTools->EncodeImage(image, aMimeType, u""_ns,
diff --git a/dom/media/mediasession/MediaSession.cpp b/dom/media/mediasession/MediaSession.cpp
@@ -325,19 +325,21 @@ void MediaSession::NotifyMetadataUpdated() {
mMetadataRequest.DisconnectIfExists();
- mMediaMetadata->LoadMetadataArtwork()->Then(
- GetCurrentSerialEventTarget(), __func__,
- [self = RefPtr{this}, currentBC](MediaMetadataBase&& aMetadata) {
- if (RefPtr<IMediaInfoUpdater> updater =
- ContentMediaAgent::Get(currentBC)) {
- updater->UpdateMetadata(currentBC->Id(), Some(aMetadata));
- }
-
- self->mMetadataRequest.Complete();
- },
- [](nsresult rv) {
- MOZ_ASSERT_UNREACHABLE("LoadMetadataArtwork should always resolve");
- })->Track(mMetadataRequest);
+ mMediaMetadata->LoadMetadataArtwork()
+ ->Then(
+ GetCurrentSerialEventTarget(), __func__,
+ [self = RefPtr{this}, currentBC](MediaMetadataBase&& aMetadata) {
+ if (RefPtr<IMediaInfoUpdater> updater =
+ ContentMediaAgent::Get(currentBC)) {
+ updater->UpdateMetadata(currentBC->Id(), Some(aMetadata));
+ }
+
+ self->mMetadataRequest.Complete();
+ },
+ [](nsresult rv) {
+ MOZ_ASSERT_UNREACHABLE("LoadMetadataArtwork should always resolve");
+ })
+ ->Track(mMetadataRequest);
}
void MediaSession::NotifyEnableSupportedAction(MediaSessionAction aAction) {
diff --git a/dom/media/mediasession/MediaSession.h b/dom/media/mediasession/MediaSession.h
@@ -133,7 +133,7 @@ class MediaSession final : public nsIDocumentActivity, public nsWrapperCache {
SessionDocStatus mSessionDocState = SessionDocStatus::eInactive;
MozPromiseRequestHolder<mozilla::dom::MediaMetadataBasePromise>
- mMetadataRequest;
+ mMetadataRequest;
};
} // namespace dom
diff --git a/widget/gtk/MPRISServiceHandler.cpp b/widget/gtk/MPRISServiceHandler.cpp
@@ -548,8 +548,9 @@ void MPRISServiceHandler::SetMediaMetadata(
// Only used to hold the image data
nsCOMPtr<nsIInputStream> inputStream;
- nsresult rv = dom::GetEncodedImageBuffer(
- image.mDataSurface, mMimeType, getter_AddRefs(inputStream), &size, &data);
+ nsresult rv =
+ dom::GetEncodedImageBuffer(image.mDataSurface, mMimeType,
+ getter_AddRefs(inputStream), &size, &data);
if (NS_FAILED(rv) || !inputStream || size == 0 || !data) {
LOGMPRIS("Failed to get the image buffer info. Try next image");
continue;
diff --git a/widget/windows/WindowsSMTCProvider.cpp b/widget/windows/WindowsSMTCProvider.cpp
@@ -617,8 +617,8 @@ void WindowsSMTCProvider::LoadThumbnail(
// Only used to hold the image data
nsCOMPtr<nsIInputStream> inputStream;
nsresult rv = mozilla::dom::GetEncodedImageBuffer(
- image.mDataSurface, nsLiteralCString(IMAGE_PNG), getter_AddRefs(inputStream),
- &size, &src);
+ image.mDataSurface, nsLiteralCString(IMAGE_PNG),
+ getter_AddRefs(inputStream), &size, &src);
if (NS_FAILED(rv) || !inputStream || size == 0 || !src) {
LOG("Failed to get the image buffer info. Try next image");
continue;