Changeset 186593 in webkit

Timestamp:

Jul 9, 2015 9:26:33 AM (9 years ago)

Author:

mrajca@apple.com

Message:

Media Session: report to chrome client 'hasActiveMediaElements' changes
​https://bugs.webkit.org/show_bug.cgi?id=146745

Reviewed by Eric Carlson.

• Modules/mediasession/MediaSession.cpp: All updates to active media elements are now funneled through a helper method that will invoke the 'hasMediaSessionWithActiveMediaElementsDidChange' callback when necessary.

(WebCore::MediaSession::removeMediaElement):
(WebCore::MediaSession::changeActiveMediaElements):
(WebCore::MediaSession::addActiveMediaElement):
(WebCore::MediaSession::releaseSession):

• Modules/mediasession/MediaSession.h:
• Modules/mediasession/MediaSessionManager.cpp:

(WebCore::MediaSessionManager::hasActiveMediaElements):

• Modules/mediasession/MediaSessionManager.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-08  Matt Rajca  <mrajca@apple.com>
+
+        Media Session: report to chrome client 'hasActiveMediaElements' changes
+        https://bugs.webkit.org/show_bug.cgi?id=146745
+
+        Reviewed by Eric Carlson.
+
+        * Modules/mediasession/MediaSession.cpp: All updates to active media elements are now funneled through a helper
+          method that will invoke the 'hasMediaSessionWithActiveMediaElementsDidChange' callback when necessary.
+        (WebCore::MediaSession::removeMediaElement):
+        (WebCore::MediaSession::changeActiveMediaElements):
+        (WebCore::MediaSession::addActiveMediaElement):
+        (WebCore::MediaSession::releaseSession):
+        * Modules/mediasession/MediaSession.h:
+        * Modules/mediasession/MediaSessionManager.cpp:
+        (WebCore::MediaSessionManager::hasActiveMediaElements):
+        * Modules/mediasession/MediaSessionManager.h:
+
 2015-07-09  Darin Adler  <darin@apple.com>
 

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

@@ -116 +116 @@
     m_participatingElements.remove(&element);
 
-    m_activeParticipatingElements.remove(&element);
+    changeActiveMediaElements([&]() {
+        m_activeParticipatingElements.remove(&element);
+    });
+
     if (m_iteratedActiveParticipatingElements)
         m_iteratedActiveParticipatingElements->remove(&element);
 }
 
+void MediaSession::changeActiveMediaElements(std::function<void(void)> worker)
+{
+    if (Page *page = m_document.page()) {
+        bool hadActiveMediaElements = MediaSessionManager::singleton().hasActiveMediaElements();
+
+        worker();
+
+        bool hasActiveMediaElements = MediaSessionManager::singleton().hasActiveMediaElements();
+        if (hadActiveMediaElements != hasActiveMediaElements)
+            page->chrome().client().hasMediaSessionWithActiveMediaElementsDidChange(hasActiveMediaElements);
+    } else
+        worker();
+}
+
 void MediaSession::addActiveMediaElement(HTMLMediaElement& element)
 {
-    m_activeParticipatingElements.add(&element);
+    changeActiveMediaElements([&]() {
+        m_activeParticipatingElements.add(&element);
+    });
 }
 
@@ -131 +150 @@
 }
 
-bool MediaSession::hasActiveMediaElements()
+bool MediaSession::hasActiveMediaElements() const
 {
     return !m_activeParticipatingElements.isEmpty();
@@ -172 +191 @@
     // 2. Indefinitely pause all of media session's active participating media elements.
     // 3. Reset media session's active participating media elements to an empty list.
-    while (!m_activeParticipatingElements.isEmpty())
-        m_activeParticipatingElements.takeAny()->pause();
+    changeActiveMediaElements([&]() {
+        while (!m_activeParticipatingElements.isEmpty())
+            m_activeParticipatingElements.takeAny()->pause();
+    });
 
     // 4. Run the media session release algorithm for media session.

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

@@ -59 +59 @@
 
     State currentState() const { return m_currentState; }
+    bool hasActiveMediaElements() const;
 
     void setMetadata(const Dictionary&);
@@ -88 +89 @@
     void removeMediaElement(HTMLMediaElement&);
 
+    void changeActiveMediaElements(std::function<void(void)>);
     void addActiveMediaElement(HTMLMediaElement&);
     bool isMediaElementActive(HTMLMediaElement&);
-    bool hasActiveMediaElements();
 
     void releaseInternal();

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

@@ -40 +40 @@
     static NeverDestroyed<MediaSessionManager> manager;
     return manager;
+}
+
+bool MediaSessionManager::hasActiveMediaElements() const
+{
+    for (auto* session : m_sessions) {
+        if (session->hasActiveMediaElements())
+            return true;
+    }
+
+    return false;
 }
 

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

@@ -46 +46 @@
     friend class MediaSession;
 
+    bool hasActiveMediaElements() const;
+
     void addMediaSession(MediaSession&);
     void removeMediaSession(MediaSession&);