Changeset 224121 in webkit

Timestamp:

Oct 27, 2017 11:38:43 AM (6 years ago)

Author:

eric.carlson@apple.com

Message:

NowPlayingInfo should contain a unique identifier
​https://bugs.webkit.org/show_bug.cgi?id=178872
<rdar://problem/34924012>

Unreviewed, build fix.

• platform/audio/ios/MediaSessionManagerIOS.mm:

(WebCore::MediaSessionManageriOS::updateNowPlayingInfo): Call string.impl().hash() instead of
string.existingHash() because the later will assert in a debug build if the hash hasn't
been calculated yet.

• platform/audio/mac/MediaSessionManagerMac.mm:

(WebCore::MediaSessionManagerMac::updateNowPlayingInfo): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/ios/MediaSessionManagerIOS.mm (modified) (1 diff)
• platform/audio/mac/MediaSessionManagerMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-27  Eric Carlson  <eric.carlson@apple.com>
+
+        NowPlayingInfo should contain a unique identifier
+        https://bugs.webkit.org/show_bug.cgi?id=178872
+        <rdar://problem/34924012>
+
+        Unreviewed, build fix.
+
+        * platform/audio/ios/MediaSessionManagerIOS.mm:
+        (WebCore::MediaSessionManageriOS::updateNowPlayingInfo): Call string.impl().hash() instead of
+        string.existingHash() because the later will assert in a debug build if the hash hasn't
+        been calculated yet.
+        * platform/audio/mac/MediaSessionManagerMac.mm:
+        (WebCore::MediaSessionManagerMac::updateNowPlayingInfo): Ditto.
+
 2017-10-27  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm

@@ -272 +272 @@
         info.get()[MPMediaItemPropertyPlaybackDuration] = @(duration);
     info.get()[MPNowPlayingInfoPropertyPlaybackRate] = @(rate);
-    info.get()[kMRMediaRemoteNowPlayingInfoUniqueIdentifier] = @(title.existingHash());
+    info.get()[kMRMediaRemoteNowPlayingInfoUniqueIdentifier] = @(title.impl() ? title.impl()->hash() : 0);
 
     if (std::isfinite(currentTime) && currentTime != MediaPlayer::invalidTime())

trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.mm

@@ -179 +179 @@
     CFDictionarySetValue(info.get(), kMRMediaRemoteNowPlayingInfoPlaybackRate, cfRate.get());
 
-    m_lastUpdatedNowPlayingInfoUniqueIdentifier = title.existingHash();
+    m_lastUpdatedNowPlayingInfoUniqueIdentifier = title.impl() ? title.impl()->hash() : 0;
     auto cfIdentifier = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberLongLongType, &m_lastUpdatedNowPlayingInfoUniqueIdentifier));
     CFDictionarySetValue(info.get(), kMRMediaRemoteNowPlayingInfoUniqueIdentifier, cfIdentifier.get());