Title: [274670] branches/safari-612.1.7-branch/Source/WebCore
- Revision
- 274670
- Author
- repst...@apple.com
- Date
- 2021-03-18 13:31:18 -0700 (Thu, 18 Mar 2021)
Log Message
Cherry-pick r274669. Unreviewed build fix.
Fix a Catalyst build.
* Modules/mediasession/MediaMetadata.h:
(WebCore::MediaMetadata::artworkImage const):
* testing/Internals.cpp:
(WebCore::Internals::loadArtworkImage):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274667 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.7-branch/Source/WebCore/ChangeLog (274669 => 274670)
--- branches/safari-612.1.7-branch/Source/WebCore/ChangeLog 2021-03-18 20:26:36 UTC (rev 274669)
+++ branches/safari-612.1.7-branch/Source/WebCore/ChangeLog 2021-03-18 20:31:18 UTC (rev 274670)
@@ -1,3 +1,27 @@
+2021-03-18 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r274667. Unreviewed build fix.
+
+ Fix a Catalyst build.
+
+ * Modules/mediasession/MediaMetadata.h:
+ (WebCore::MediaMetadata::artworkImage const):
+ * testing/Internals.cpp:
+ (WebCore::Internals::loadArtworkImage):
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274667 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-03-18 Alex Christensen <achristen...@webkit.org>
+
+ Fix a Catalyst build.
+
+ * Modules/mediasession/MediaMetadata.h:
+ (WebCore::MediaMetadata::artworkImage const):
+ * testing/Internals.cpp:
+ (WebCore::Internals::loadArtworkImage):
+
2021-03-18 Carlos Garcia Campos <cgar...@igalia.com>
[SOUP] SOUP3 crashes inside soup_message_set_request_body
Modified: branches/safari-612.1.7-branch/Source/WebCore/Modules/mediasession/MediaMetadata.h (274669 => 274670)
--- branches/safari-612.1.7-branch/Source/WebCore/Modules/mediasession/MediaMetadata.h 2021-03-18 20:26:36 UTC (rev 274669)
+++ branches/safari-612.1.7-branch/Source/WebCore/Modules/mediasession/MediaMetadata.h 2021-03-18 20:31:18 UTC (rev 274670)
@@ -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: branches/safari-612.1.7-branch/Source/WebCore/testing/Internals.cpp (274669 => 274670)
--- branches/safari-612.1.7-branch/Source/WebCore/testing/Internals.cpp 2021-03-18 20:26:36 UTC (rev 274669)
+++ branches/safari-612.1.7-branch/Source/WebCore/testing/Internals.cpp 2021-03-18 20:31:18 UTC (rev 274670)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
