Explicitly keep track of active HTMLMediaElements in MediaSessions.

https://bugs.webkit.org/show_bug.cgi?id=145829

Patch by Matt Rajca <mrajca@apple.com> on 2015-06-10
Reviewed by Eric Carlson.

* Modules/mediasession/MediaSession.cpp: Add support for keeping track of active media elements.
(WebCore::MediaSession::addActiveMediaElement):
* Modules/mediasession/MediaSession.h:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::playInternal): If the paused attribute is true and the readyState attribute has the
  value HAVE_FUTURE_DATA or HAVE_ENOUGH_DATA, the media element becomes an active participating element of the
  media session.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185424 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 26c69d9..70d0d1c 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2015-06-10  Matt Rajca  <mrajca@apple.com>
+
+        Explicitly keep track of active HTMLMediaElements in MediaSessions.
+        https://bugs.webkit.org/show_bug.cgi?id=145829
+
+        Reviewed by Eric Carlson.
+
+        * Modules/mediasession/MediaSession.cpp: Add support for keeping track of active media elements.
+        (WebCore::MediaSession::addActiveMediaElement):
+        * Modules/mediasession/MediaSession.h:
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::playInternal): If the paused attribute is true and the readyState attribute has the
+          value HAVE_FUTURE_DATA or HAVE_ENOUGH_DATA, the media element becomes an active participating element of the
+          media session.
+

 2015-06-10  Chris Dumez  <cdumez@apple.com>
 
         Drop unused argument for Node::didNotifySubtreeInsertions()
 2015-06-10  Chris Dumez  <cdumez@apple.com>
 
         Drop unused argument for Node::didNotifySubtreeInsertions()

diff --git a/Source/WebCore/Modules/mediasession/MediaSession.cpp b/Source/WebCore/Modules/mediasession/MediaSession.cpp
index 7e9a2a3..c240d26 100644 (file)
--- a/Source/WebCore/Modules/mediasession/MediaSession.cpp
+++ b/Source/WebCore/Modules/mediasession/MediaSession.cpp
@@ -66,16 +66,9 @@ void MediaSession::removeMediaElement(HTMLMediaElement& element)
     m_participatingElements.remove(m_participatingElements.find(&element));
 }
 
     m_participatingElements.remove(m_participatingElements.find(&element));
 }
 

-Vector<HTMLMediaElement*> MediaSession::activeParticipatingElements() const
+void MediaSession::addActiveMediaElement(HTMLMediaElement& element)

 {
 {

-    Vector<HTMLMediaElement*> elements;
-
-    for (auto* element : m_participatingElements) {
-        if (element->isPlaying())
-            elements.append(element);
-    }
-
-    return elements;
+    m_activeParticipatingElements.add(&element);

 }
 
 void MediaSession::releaseSession()
 }
 
 void MediaSession::releaseSession()


@@ -84,7 +77,7 @@ void MediaSession::releaseSession()
 
 void MediaSession::togglePlayback()
 {
 
 void MediaSession::togglePlayback()
 {

-    for (auto* element : activeParticipatingElements()) {
+    for (auto* element : m_activeParticipatingElements) {

         if (element->paused())
             element->play();
         else
         if (element->paused())
             element->play();
         else

diff --git a/Source/WebCore/Modules/mediasession/MediaSession.h b/Source/WebCore/Modules/mediasession/MediaSession.h
index d2c31c1..87c8312 100644 (file)
--- a/Source/WebCore/Modules/mediasession/MediaSession.h
+++ b/Source/WebCore/Modules/mediasession/MediaSession.h
@@ -65,10 +65,11 @@ private:
     void addMediaElement(HTMLMediaElement&);
     void removeMediaElement(HTMLMediaElement&);
 
     void addMediaElement(HTMLMediaElement&);
     void removeMediaElement(HTMLMediaElement&);
 

-    Vector<HTMLMediaElement*> activeParticipatingElements() const;
+    void addActiveMediaElement(HTMLMediaElement&);

 
     State m_currentState { State::Idle };
     Vector<HTMLMediaElement*> m_participatingElements;
 
     State m_currentState { State::Idle };
     Vector<HTMLMediaElement*> m_participatingElements;

+    HashSet<HTMLMediaElement*> m_activeParticipatingElements;

 
     const String m_kind;
     RefPtr<MediaRemoteControls> m_controls;
 
     const String m_kind;
     RefPtr<MediaRemoteControls> m_controls;

diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
index eb7004c..e4acbed 100644 (file)
--- a/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -2829,6 +2829,19 @@ void HTMLMediaElement::playInternal()
             scheduleEvent(eventNames().waitingEvent);
         else if (m_readyState >= HAVE_FUTURE_DATA)
             scheduleEvent(eventNames().playingEvent);
             scheduleEvent(eventNames().waitingEvent);
         else if (m_readyState >= HAVE_FUTURE_DATA)
             scheduleEvent(eventNames().playingEvent);

+
+#if ENABLE(MEDIA_SESSION)
+        // 6.3 Activating a media session from a media element
+        // When the play() method is invoked, the paused attribute is true, and the readyState attribute has the value
+        // HAVE_FUTURE_DATA or HAVE_ENOUGH_DATA, then
+        // 1. Let media session be the value of the current media session.
+        // 2. If we are not currently in media session's list of active participating media elements then append
+        //    ourselves to this list.
+        if (m_readyState == HAVE_ENOUGH_DATA || m_readyState == HAVE_FUTURE_DATA) {
+            if (m_session)
+                m_session->addActiveMediaElement(*this);
+        }
+#endif

     }
     m_autoplaying = false;
     updatePlayState();
     }
     m_autoplaying = false;
     updatePlayState();