Changeset 231866 in webkit

Timestamp:

May 16, 2018 1:36:26 PM (6 years ago)

Author:

eric.carlson@apple.com

Message:

Improve NowPlaying "title"
​https://bugs.webkit.org/show_bug.cgi?id=185680
<rdar://problem/40296700>

Reviewed by Jer Noble.
Source/WebCore:

We send NowPlaying the element's title attribute if not empty, else the element's current url.
Title should be preferred because it is the most specific, but we should use the document
title if non-empty next, and if falling back to the element's url use just the domain instead
of the full url because it isn't likely to be useful to the user given the small amount of
space control center uses to display the title. Further, don't use any title at all when
in private browsing mode.

Tests: http/tests/media/now-playing-info-private-browsing.html

http/tests/media/now-playing-info.html

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::parseAttribute): Update NowPlaying when the title attribute changes.
(WebCore::HTMLMediaElement::finishSeek): Update NowPlaying when a seek completes.
(WebCore::HTMLMediaElement::mediaSessionTitle const): Update logic.
(WebCore::HTMLMediaElement::mediaSessionUniqueIdentifier const): Use the hash of the current
url as the unique identifier.

• html/HTMLMediaElement.h:

• platform/audio/PlatformMediaSession.cpp:

(WebCore::PlatformMediaSession::uniqueIdentifier const): New.
(WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Ditto.

• platform/audio/PlatformMediaSession.h:

• platform/audio/ios/MediaSessionManagerIOS.mm:

(WebCore::MediaSessionManageriOS::updateNowPlayingInfo): Update m_lastUpdatedNowPlayingInfoUniqueIdentifier.

• platform/audio/mac/MediaSessionManagerMac.mm:

(WebCore::MediaSessionManagerMac::updateNowPlayingInfo): Update.

• testing/Internals.cpp:

(WebCore::Internals::nowPlayingState const): Expose NowPlaying state.

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

• http/tests/media/now-playing-info-expected.txt: Added.
• http/tests/media/now-playing-info-private-browsing-expected.txt: Added.
• http/tests/media/now-playing-info-private-browsing.html: Added.
• http/tests/media/now-playing-info.html: Added.
• platform/gtk/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/media/now-playing-info-expected.txt (added)
• LayoutTests/http/tests/media/now-playing-info-private-browsing-expected.txt (added)
• LayoutTests/http/tests/media/now-playing-info-private-browsing.html (added)
• LayoutTests/http/tests/media/now-playing-info.html (added)
• LayoutTests/media/video-test.js (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (3 diffs)
• Source/WebCore/html/HTMLMediaElement.h (modified) (1 diff)
• Source/WebCore/platform/audio/PlatformMediaSession.cpp (modified) (2 diffs)
• Source/WebCore/platform/audio/PlatformMediaSession.h (modified) (2 diffs)
• Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (modified) (1 diff)
• Source/WebCore/platform/audio/mac/MediaSessionManagerMac.mm (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-05-16  Eric Carlson  <eric.carlson@apple.com>
+
+        Improve NowPlaying "title"
+        https://bugs.webkit.org/show_bug.cgi?id=185680
+        <rdar://problem/40296700>
+
+        Reviewed by Jer Noble.
+
+        * http/tests/media/now-playing-info-expected.txt: Added.
+        * http/tests/media/now-playing-info-private-browsing-expected.txt: Added.
+        * http/tests/media/now-playing-info-private-browsing.html: Added.
+        * http/tests/media/now-playing-info.html: Added.
+        * platform/gtk/TestExpectations:
+
 2018-05-16  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/media/video-test.js

@@ -187 +187 @@
 }
 
-function waitFor(element, event) {
+function waitFor(element, type) {
     return new Promise(resolve => {
-        element.addEventListener(event, event => {
+        element.addEventListener(type, event => {
             consoleWrite(`EVENT(${event.type})`);
             resolve(event);

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1188 +1188 @@
 webkit.org/b/184295 http/wpt/loading/redirect-headers.html [ Skip ]
 
+# NowPlaying is macOS and iOS only.
+http/tests/media/now-playing-info-private-browsing.html [ Skip ]
+http/tests/media/now-playing-info.html [ Skip ]
+
 #////////////////////////////////////////////////////////////////////////////////////////
 # End of Expected failures.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-16  Eric Carlson  <eric.carlson@apple.com>
+
+        Improve NowPlaying "title"
+        https://bugs.webkit.org/show_bug.cgi?id=185680
+        <rdar://problem/40296700>
+
+        Reviewed by Jer Noble.
+        
+        We send NowPlaying the element's title attribute if not empty, else the element's current url.
+        Title should be preferred because it is the most specific, but we should use the document
+        title if non-empty next, and if falling back to the element's url use just the domain instead
+        of the full url because it isn't likely to be useful to the user given the small amount of
+        space control center uses to display the title. Further, don't use any title at all when
+        in private browsing mode.
+
+        Tests: http/tests/media/now-playing-info-private-browsing.html
+               http/tests/media/now-playing-info.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::parseAttribute): Update NowPlaying when the title attribute changes.
+        (WebCore::HTMLMediaElement::finishSeek): Update NowPlaying when a seek completes.
+        (WebCore::HTMLMediaElement::mediaSessionTitle const): Update logic.
+        (WebCore::HTMLMediaElement::mediaSessionUniqueIdentifier const): Use the hash of the current 
+        url as the unique identifier.
+        * html/HTMLMediaElement.h:
+
+        * platform/audio/PlatformMediaSession.cpp:
+        (WebCore::PlatformMediaSession::uniqueIdentifier const): New.
+        (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Ditto.
+        * platform/audio/PlatformMediaSession.h:
+
+        * platform/audio/ios/MediaSessionManagerIOS.mm:
+        (WebCore::MediaSessionManageriOS::updateNowPlayingInfo): Update m_lastUpdatedNowPlayingInfoUniqueIdentifier.
+
+        * platform/audio/mac/MediaSessionManagerMac.mm:
+        (WebCore::MediaSessionManagerMac::updateNowPlayingInfo): Update.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::nowPlayingState const): Expose NowPlaying state.
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2018-05-16  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -879 +879 @@
         if (processingUserGestureForMedia())
             removeBehaviorsRestrictionsAfterFirstUserGesture();
+    } else if (name == titleAttr) {
+        if (m_mediaSession)
+            m_mediaSession->clientCharacteristicsChanged();
     }
     else
@@ -3081 +3084 @@
     // 17 - Queue a task to fire a simple event named seeked at the element.
     scheduleEvent(eventNames().seekedEvent);
+
+    if (m_mediaSession)
+        m_mediaSession->clientCharacteristicsChanged();
 
 #if ENABLE(MEDIA_SOURCE)
@@ -7444 +7450 @@
 String HTMLMediaElement::mediaSessionTitle() const
 {
-    if (hasAttributeWithoutSynchronization(titleAttr))
-        return attributeWithoutSynchronization(titleAttr);
-
-    return m_currentSrc;
+    if (!document().page() || document().page()->usesEphemeralSession())
+        return emptyString();
+
+    if (hasAttributeWithoutSynchronization(titleAttr)) {
+        auto title = attributeWithoutSynchronization(titleAttr);
+        if (!title.isEmpty())
+            return title;
+    }
+
+    auto title = document().title();
+    if (!title.isEmpty())
+        return title;
+
+    return m_currentSrc.host();
+}
+
+uint64_t HTMLMediaElement::mediaSessionUniqueIdentifier() const
+{
+    auto& url = m_currentSrc.string();
+    return url.impl() ? url.impl()->hash() : 0;
 }
 

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -861 +861 @@
     void resumeAutoplaying() override;
     void mayResumePlayback(bool shouldResume) override;
+    uint64_t mediaSessionUniqueIdentifier() const final;
     String mediaSessionTitle() const override;
     double mediaSessionDuration() const override { return duration(); }

trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp

@@ -239 +239 @@
 
 #if ENABLE(VIDEO)
+uint64_t PlatformMediaSession::uniqueIdentifier() const
+{
+    return m_client.mediaSessionUniqueIdentifier();
+}
+
 String PlatformMediaSession::title() const
 {
@@ -324 +329 @@
 
 #if ENABLE(VIDEO)
+uint64_t PlatformMediaSessionClient::mediaSessionUniqueIdentifier() const
+{
+    return 0;
+}
+
 String PlatformMediaSessionClient::mediaSessionTitle() const
 {

trunk/Source/WebCore/platform/audio/PlatformMediaSession.h

@@ -114 +114 @@
     
 #if ENABLE(VIDEO)
+    uint64_t uniqueIdentifier() const;
     String title() const;
     double duration() const;
@@ -217 +218 @@
 
 #if ENABLE(VIDEO)
+    virtual uint64_t mediaSessionUniqueIdentifier() const;
     virtual String mediaSessionTitle() const;
     virtual double mediaSessionDuration() const;

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

@@ -281 +281 @@
     m_reportedTitle = title;
     m_reportedCurrentTime = currentTime;
+    m_lastUpdatedNowPlayingInfoUniqueIdentifier = currentSession->uniqueIdentifier();
 
     auto info = adoptNS([[NSMutableDictionary alloc] init]);

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

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

trunk/Source/WebCore/testing/Internals.cpp

@@ -3693 +3693 @@
 }
 
+ExceptionOr<Internals::NowPlayingState> Internals::nowPlayingState() const
+{
+#if ENABLE(VIDEO)
+    return { { PlatformMediaSessionManager::sharedManager().lastUpdatedNowPlayingTitle(),
+        PlatformMediaSessionManager::sharedManager().lastUpdatedNowPlayingDuration(),
+        PlatformMediaSessionManager::sharedManager().lastUpdatedNowPlayingElapsedTime(),
+        PlatformMediaSessionManager::sharedManager().lastUpdatedNowPlayingInfoUniqueIdentifier(),
+        PlatformMediaSessionManager::sharedManager().hasActiveNowPlayingSession(),
+        PlatformMediaSessionManager::sharedManager().registeredAsNowPlayingApplication()
+    } };
+#else
+    return Exception { InvalidAccessError };
+#endif
+}
+
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
 

trunk/Source/WebCore/testing/Internals.h

@@ -671 +671 @@
     bool usingAppleInternalSDK() const;
 
+    struct NowPlayingState {
+        String title;
+        double duration;
+        double elapsedTime;
+        uint64_t uniqueIdentifier;
+        bool hasActiveSession;
+        bool registeredAsNowPlayingApplication;
+    };
+    ExceptionOr<NowPlayingState> nowPlayingState() const;
+
 private:
     explicit Internals(Document&);

trunk/Source/WebCore/testing/Internals.idl

@@ -85 +85 @@
 [
     ExportMacro=WEBCORE_TESTSUPPORT_EXPORT,
+    Conditional=VIDEO,
+    JSGenerateToJSObject,
+] dictionary NowPlayingState {
+    boolean hasActiveSession;
+    boolean registeredAsNowPlayingApplication;
+    DOMString title;
+    unrestricted double duration;
+    unrestricted double elapsedTime;
+    unsigned long long uniqueIdentifier;
+};
+
+[
+    ExportMacro=WEBCORE_TESTSUPPORT_EXPORT,
     NoInterfaceObject,
 ] interface Internals {
@@ -602 +615 @@
 
     boolean usingAppleInternalSDK();
-};
+
+    [Conditional=VIDEO, MayThrowException] readonly attribute NowPlayingState nowPlayingState;
+};