Changeset 185424 in webkit

Timestamp:

Jun 10, 2015 11:43:52 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediasession/MediaSession.cpp (modified) (2 diffs)
• Modules/mediasession/MediaSession.h (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp

@@ -67 +67 @@
 }
 
-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);
 }
 
@@ -85 +78 @@
 void MediaSession::togglePlayback()
 {
-    for (auto* element : activeParticipatingElements()) {
+    for (auto* element : m_activeParticipatingElements) {
         if (element->paused())
             element->play();

trunk/Source/WebCore/Modules/mediasession/MediaSession.h

@@ -66 +66 @@
     void removeMediaElement(HTMLMediaElement&);
 
-    Vector<HTMLMediaElement*> activeParticipatingElements() const;
+    void addActiveMediaElement(HTMLMediaElement&);
 
     State m_currentState { State::Idle };
     Vector<HTMLMediaElement*> m_participatingElements;
+    HashSet<HTMLMediaElement*> m_activeParticipatingElements;
 
     const String m_kind;

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -2830 +2830 @@
         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;