Changeset 185270 in webkit

Timestamp:

Jun 5, 2015 3:33:23 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

MediaSessions should keep track of their participating media elements.
​https://bugs.webkit.org/show_bug.cgi?id=145703

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

• Modules/mediasession/MediaSession.cpp:

(WebCore::MediaSession::addMediaElement): Add the given media element to the media session.
(WebCore::MediaSession::removeMediaElement): Remove the given media element from the media session.
(WebCore::MediaSession::activeParticipatingElements): Dynamically build a vector of actively-playing media

elements.

• Modules/mediasession/MediaSession.h:
• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::~HTMLMediaElement): Ensure the element is removed from its media session.
(WebCore::HTMLMediaElement::setSession): Update sessions' references to their media elements.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-05  Matt Rajca  <mrajca@apple.com>
+
+        MediaSessions should keep track of their participating media elements.
+        https://bugs.webkit.org/show_bug.cgi?id=145703
+
+        Reviewed by Eric Carlson.
+
+        * Modules/mediasession/MediaSession.cpp:
+        (WebCore::MediaSession::addMediaElement): Add the given media element to the media session.
+        (WebCore::MediaSession::removeMediaElement): Remove the given media element from the media session.
+        (WebCore::MediaSession::activeParticipatingElements): Dynamically build a vector of actively-playing media
+          elements.
+        * Modules/mediasession/MediaSession.h:
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::~HTMLMediaElement): Ensure the element is removed from its media session.
+        (WebCore::HTMLMediaElement::setSession): Update sessions' references to their media elements.
+
 2015-06-05  Chris Dumez  <cdumez@apple.com>
 

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

@@ -29 +29 @@
 #if ENABLE(MEDIA_SESSION)
 
+#include "HTMLMediaElement.h"
+
 namespace WebCore {
 
@@ -49 +51 @@
 }
 
+void MediaSession::addMediaElement(HTMLMediaElement& element)
+{
+    ASSERT(!m_participatingElements.contains(&element));
+    m_participatingElements.append(&element);
+}
+
+void MediaSession::removeMediaElement(HTMLMediaElement& element)
+{
+    ASSERT(m_participatingElements.contains(&element));
+    m_participatingElements.remove(m_participatingElements.find(&element));
+}
+
+Vector<HTMLMediaElement*> MediaSession::activeParticipatingElements() const
+{
+    Vector<HTMLMediaElement*> elements;
+
+    for (auto* element : m_participatingElements) {
+        if (element->isPlaying())
+            elements.append(element);
+    }
+
+    return elements;
+}
+
 void MediaSession::releaseSession()
 {

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

@@ -33 +33 @@
 namespace WebCore {
 
+class HTMLMediaElement;
+
 class MediaSession final : public RefCounted<MediaSession> {
 public:
@@ -55 +57 @@
     };
 
+    friend class HTMLMediaElement;
+
+    void addMediaElement(HTMLMediaElement&);
+    void removeMediaElement(HTMLMediaElement&);
+
+    Vector<HTMLMediaElement*> activeParticipatingElements() const;
+
     State m_currentState { State::Idle };
+    Vector<HTMLMediaElement*> m_participatingElements;
 
     const String m_kind;

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -458 +458 @@
 #endif
 
+#if ENABLE(MEDIA_SESSION)
+    if (m_session) {
+        m_session->removeMediaElement(*this);
+        m_session = nullptr;
+    }
+#endif
+
     m_seekTaskQueue.close();
 
@@ -6368 +6375 @@
 void HTMLMediaElement::setSession(MediaSession* session)
 {
+    if (m_session)
+        m_session->removeMediaElement(*this);
+
     m_session = session;
-}
-
-#endif
-
-}
-
-#endif
+
+    if (session)
+        session->addMediaElement(*this);
+}
+
+#endif
+
+}
+
+#endif