Changeset 215617 in webkit

Timestamp:

Apr 21, 2017, 11:09:41 AM (9 years ago)

Author:

jer.noble@apple.com

Message:

Fix some spurious ASSERTs when working with capturing media elements
​https://bugs.webkit.org/show_bug.cgi?id=171096

Reviewed by Youenn Fablet.

Two related ASSERTS:

1) When we added a new PlatformMediaSession MediaType (MediaStreamCapturingAudio), we did not update all the
places that validated the enum. This would lead to spurious ASSERTs when an element capturing audio would
fail various checks to enusre it's type's validity.

2) Audio elements will ASSERT when they change page visibility, as they do not have a renderer which implements
visibleInViewportStateChanged(). So opt out of visibility-state checking for non-video media elements.

• html/MediaElementSession.cpp:

(WebCore::MediaElementSession::wantsToObserveViewportVisibilityForAutoplay):

• platform/audio/PlatformMediaSessionManager.cpp:

(WebCore::PlatformMediaSessionManager::resetRestrictions):
(WebCore::PlatformMediaSessionManager::addRestriction):
(WebCore::PlatformMediaSessionManager::removeRestriction):
(WebCore::PlatformMediaSessionManager::restrictions):

• platform/audio/PlatformMediaSessionManager.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/MediaElementSession.cpp (modified) (1 diff)
• platform/audio/PlatformMediaSessionManager.cpp (modified) (4 diffs)
• platform/audio/PlatformMediaSessionManager.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-21  Jer Noble  <jer.noble@apple.com>
+
+        Fix some spurious ASSERTs when working with capturing media elements
+        https://bugs.webkit.org/show_bug.cgi?id=171096
+
+        Reviewed by Youenn Fablet.
+
+        Two related ASSERTS:
+
+        1) When we added a new PlatformMediaSession MediaType (MediaStreamCapturingAudio), we did not update all the
+        places that validated the enum. This would lead to spurious ASSERTs when an element capturing audio would
+        fail various checks to enusre it's type's validity.
+
+        2) Audio elements will ASSERT when they change page visibility, as they do not have a renderer which implements
+        visibleInViewportStateChanged(). So opt out of visibility-state checking for non-video media elements.
+
+        * html/MediaElementSession.cpp:
+        (WebCore::MediaElementSession::wantsToObserveViewportVisibilityForAutoplay):
+        * platform/audio/PlatformMediaSessionManager.cpp:
+        (WebCore::PlatformMediaSessionManager::resetRestrictions):
+        (WebCore::PlatformMediaSessionManager::addRestriction):
+        (WebCore::PlatformMediaSessionManager::removeRestriction):
+        (WebCore::PlatformMediaSessionManager::restrictions):
+        * platform/audio/PlatformMediaSessionManager.h:
+
 2017-04-21  Konstantin Tokarev  <annulen@yandex.ru>
 

trunk/Source/WebCore/html/MediaElementSession.cpp

@@ -371 +371 @@
 bool MediaElementSession::wantsToObserveViewportVisibilityForAutoplay() const
 {
+    if (!m_element.isVideo())
+        return false;
     return hasBehaviorRestriction(InvisibleAutoplayNotPermitted) || hasBehaviorRestriction(OverrideUserGestureRequirementForMainContent);
 }

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

@@ -70 +70 @@
     m_restrictions[PlatformMediaSession::VideoAudio] = NoRestrictions;
     m_restrictions[PlatformMediaSession::WebAudio] = NoRestrictions;
+    m_restrictions[PlatformMediaSession::MediaStreamCapturingAudio] = NoRestrictions;
 }
 
@@ -169 +170 @@
 void PlatformMediaSessionManager::addRestriction(PlatformMediaSession::MediaType type, SessionRestrictions restriction)
 {
-    ASSERT(type > PlatformMediaSession::None && type <= PlatformMediaSession::WebAudio);
+    ASSERT(type > PlatformMediaSession::None && type <= PlatformMediaSession::MediaStreamCapturingAudio);
     m_restrictions[type] |= restriction;
 }
@@ -175 +176 @@
 void PlatformMediaSessionManager::removeRestriction(PlatformMediaSession::MediaType type, SessionRestrictions restriction)
 {
-    ASSERT(type > PlatformMediaSession::None && type <= PlatformMediaSession::WebAudio);
+    ASSERT(type > PlatformMediaSession::None && type <= PlatformMediaSession::MediaStreamCapturingAudio);
     m_restrictions[type] &= ~restriction;
 }
@@ -181 +182 @@
 PlatformMediaSessionManager::SessionRestrictions PlatformMediaSessionManager::restrictions(PlatformMediaSession::MediaType type)
 {
-    ASSERT(type > PlatformMediaSession::None && type <= PlatformMediaSession::WebAudio);
+    ASSERT(type > PlatformMediaSession::None && type <= PlatformMediaSession::MediaStreamCapturingAudio);
     return m_restrictions[type];
 }

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

@@ -136 +136 @@
     void systemDidWake() override;
 
-    SessionRestrictions m_restrictions[PlatformMediaSession::WebAudio + 1];
+    SessionRestrictions m_restrictions[PlatformMediaSession::MediaStreamCapturingAudio + 1];
     mutable Vector<PlatformMediaSession*> m_sessions;
     std::unique_ptr<RemoteCommandListener> m_remoteCommandListener;