Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (282991 => 282992)
--- branches/safari-612-branch/Source/WebCore/ChangeLog 2021-09-23 20:13:46 UTC (rev 282991)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-09-23 20:13:49 UTC (rev 282992)
@@ -1,5 +1,36 @@
2021-09-23 Russell Epstein <[email protected]>
+ Cherry-pick r281533. rdar://problem/83460974
+
+ MediaSession artwork URL is showing in logs.
+ https://bugs.webkit.org/show_bug.cgi?id=229320
+ rdar://82156288
+
+ Reviewed by Eric Carlson.
+
+ Only enable artwork logging in debug builds.
+
+ * platform/audio/cocoa/MediaSessionManagerCocoa.mm:
+ (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281533 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-08-24 Jean-Yves Avenard <[email protected]>
+
+ MediaSession artwork URL is showing in logs.
+ https://bugs.webkit.org/show_bug.cgi?id=229320
+ rdar://82156288
+
+ Reviewed by Eric Carlson.
+
+ Only enable artwork logging in debug builds.
+
+ * platform/audio/cocoa/MediaSessionManagerCocoa.mm:
+ (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo):
+
+2021-09-23 Russell Epstein <[email protected]>
+
Cherry-pick r281334. rdar://problem/83460795
Followup to <trac.webkit.org/r281288>
Modified: branches/safari-612-branch/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm (282991 => 282992)
--- branches/safari-612-branch/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm 2021-09-23 20:13:46 UTC (rev 282991)
+++ branches/safari-612-branch/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm 2021-09-23 20:13:49 UTC (rev 282992)
@@ -392,9 +392,16 @@
m_haveEverRegisteredAsNowPlayingApplication = true;
- if (m_nowPlayingManager->setNowPlayingInfo(*nowPlayingInfo))
- ALWAYS_LOG(LOGIDENTIFIER, "title = \"", nowPlayingInfo->title, "\", isPlaying = ", nowPlayingInfo->isPlaying, ", duration = ", nowPlayingInfo->duration, ", now = ", nowPlayingInfo->currentTime, ", id = ", nowPlayingInfo->uniqueIdentifier.toUInt64(), ", registered = ", m_registeredAsNowPlayingApplication, ", src = "" nowPlayingInfo->artwork ? nowPlayingInfo->artwork->src : String(), "\"");
-
+ if (m_nowPlayingManager->setNowPlayingInfo(*nowPlayingInfo)) {
+#ifdef LOG_DISABLED
+ String src = ""
+ String title = "title";
+#else
+ String src = "" ? nowPlayingInfo->artwork->src : String();
+ String title = nowPlayingInfo->title;
+#endif
+ ALWAYS_LOG(LOGIDENTIFIER, "title = \"", title, "\", isPlaying = ", nowPlayingInfo->isPlaying, ", duration = ", nowPlayingInfo->duration, ", now = ", nowPlayingInfo->currentTime, ", id = ", nowPlayingInfo->uniqueIdentifier.toUInt64(), ", registered = ", m_registeredAsNowPlayingApplication, ", src = "" src, "\"");
+ }
if (!m_registeredAsNowPlayingApplication) {
m_registeredAsNowPlayingApplication = true;
providePresentingApplicationPIDIfNecessary();
