Title: [274667] trunk/Source/WebCore
- Revision
- 274667
- Author
- [email protected]
- Date
- 2021-03-18 12:49:18 -0700 (Thu, 18 Mar 2021)
Log Message
Fix a Catalyst build.
* Modules/mediasession/MediaMetadata.h:
(WebCore::MediaMetadata::artworkImage const):
* testing/Internals.cpp:
(WebCore::Internals::loadArtworkImage):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (274666 => 274667)
--- trunk/Source/WebCore/ChangeLog 2021-03-18 19:47:24 UTC (rev 274666)
+++ trunk/Source/WebCore/ChangeLog 2021-03-18 19:49:18 UTC (rev 274667)
@@ -1,3 +1,12 @@
+2021-03-18 Alex Christensen <[email protected]>
+
+ Fix a Catalyst build.
+
+ * Modules/mediasession/MediaMetadata.h:
+ (WebCore::MediaMetadata::artworkImage const):
+ * testing/Internals.cpp:
+ (WebCore::Internals::loadArtworkImage):
+
2021-03-18 Alejandro G. Castro <[email protected]>
[GTK] Kinetic iframe async scrolling does not work
Modified: trunk/Source/WebCore/Modules/mediasession/MediaMetadata.h (274666 => 274667)
--- trunk/Source/WebCore/Modules/mediasession/MediaMetadata.h 2021-03-18 19:47:24 UTC (rev 274666)
+++ trunk/Source/WebCore/Modules/mediasession/MediaMetadata.h 2021-03-18 19:49:18 UTC (rev 274667)
@@ -87,7 +87,7 @@
ExceptionOr<void> setArtwork(ScriptExecutionContext&, Vector<MediaImage>&&);
const String& artworkSrc() const { return m_artworkImageSrc; }
- RefPtr<Image> artworkImage() const { return m_artworkImage; }
+ const RefPtr<Image>& artworkImage() const { return m_artworkImage; }
const MediaSessionMetadata& metadata() const { return m_metadata; }
Modified: trunk/Source/WebCore/testing/Internals.cpp (274666 => 274667)
--- trunk/Source/WebCore/testing/Internals.cpp 2021-03-18 19:47:24 UTC (rev 274666)
+++ trunk/Source/WebCore/testing/Internals.cpp 2021-03-18 19:49:18 UTC (rev 274667)
@@ -6103,8 +6103,12 @@
auto imageData = ImageData::create(unsigned(image->width()), unsigned(image->height()));
if (!imageData.hasException())
m_artworkImagePromise->resolve(imageData.releaseReturnValue());
- else
+ else {
+#if ENABLE(MEDIA_STREAM)
+ // FIXME: This seems out of place. Should this be rejecting m_artworkImagePromise instead?
m_nextTrackFramePromise->reject(imageData.exception().code());
+#endif
+ }
} else
m_artworkImagePromise->reject(Exception { InvalidAccessError, "No image retrieve." });
m_artworkImagePromise = nullptr;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
