Changeset 206490 in webkit

Timestamp:

Sep 27, 2016, 6:39:15 PM (9 years ago)

Author:

bshafiei@apple.com

Message:

Merge r206454. rdar://problem/28484193

Location:

branches/safari-602.2.14.0-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (4 diffs)
• html/MediaElementSession.cpp (modified) (5 diffs)
• platform/audio/mac/MediaSessionManagerMac.mm (modified) (1 diff)

branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-27  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r206454. rdar://problem/28484193
+
+    2016-09-27  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            Related videos on YouTube (and YouTube playlists) cause media controls to disappear
+            https://bugs.webkit.org/show_bug.cgi?id=162621
+            <rdar://problem/28484193>
+
+            Reviewed by Jer Noble.
+
+            Tweaks the main content media heuristic for better Now Playing behavior on YouTube by making the following
+            changes:
+            - Remove the strict requirement for audio to be actively playing for the session to be able to show
+              controls for the purpose of Now Playing, making it the same as our policy for the controls manager.
+            - Make playback requirement restrictions apply only for the controls manager. Videos that do not
+              autoplay will still have the correct behavior with respect to Now Playing, since we will bail in the
+              hasEverNotifiedAboutPlaying() check.
+            - Only consider the main content heuristic as preventing media controls from showing up for the purposes
+              of the controls manager. Now Playing should instead account for this by preferring elements large
+              enough for main content after collecting all of the candidate sessions.
+
+            * html/HTMLMediaElement.cpp:
+            (WebCore::mediaElementSessionInfoForSession):
+            (WebCore::preferMediaControlsForCandidateSessionOverOtherCandidateSession):
+            (WebCore::HTMLMediaElement::updatePlayState):
+            * html/MediaElementSession.cpp:
+            (WebCore::MediaElementSession::canShowControlsManager):
+            * platform/audio/mac/MediaSessionManagerMac.mm:
+            (WebCore::MediaSessionManagerMac::sessionWillBeginPlayback):
+
 2016-09-27  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-602.2.14.0-branch/Source/WebCore/html/HTMLMediaElement.cpp

@@ -351 +351 @@
 struct MediaElementSessionInfo {
     const MediaElementSession* session;
+    MediaElementSession::PlaybackControlsPurpose purpose;
 
     double timeOfLastUserInteraction;
@@ -364 +365 @@
     return {
         &session,
+        purpose,
         session.mostRecentUserInteractionTime(),
         session.canShowControlsManager(purpose),
@@ -374 +376 @@
 static bool preferMediaControlsForCandidateSessionOverOtherCandidateSession(const MediaElementSessionInfo& session, const MediaElementSessionInfo& otherSession)
 {
-    // Prioritize visible media over offscreen media.
-    if (session.isVisibleInViewportOrFullscreen != otherSession.isVisibleInViewportOrFullscreen)
+    MediaElementSession::PlaybackControlsPurpose purpose = session.purpose;
+    ASSERT(purpose == otherSession.purpose);
+
+    // For the controls manager, prioritize visible media over offscreen media.
+    if (purpose == MediaElementSession::PlaybackControlsPurpose::ControlsManager && session.isVisibleInViewportOrFullscreen != otherSession.isVisibleInViewportOrFullscreen)
         return session.isVisibleInViewportOrFullscreen;
+
+    // For Now Playing, prioritize elements that would normally satisfy main content.
+    if (purpose == MediaElementSession::PlaybackControlsPurpose::NowPlaying && session.isLargeEnoughForMainContent != otherSession.isLargeEnoughForMainContent)
+        return session.isLargeEnoughForMainContent;
 
     // As a tiebreaker, prioritize elements that the user recently interacted with.
@@ -5086 +5095 @@
     updateMediaController();
     updateRenderer();
+
+    m_hasEverHadAudio |= hasAudio();
+    m_hasEverHadVideo |= hasVideo();
 }
 

branches/safari-602.2.14.0-branch/Source/WebCore/html/MediaElementSession.cpp

@@ -234 +234 @@
     }
 
-    bool meetsAudioTrackRequirements = m_element.hasAudio() || (purpose == PlaybackControlsPurpose::ControlsManager && m_element.hasEverHadAudio());
-    if (!meetsAudioTrackRequirements) {
+    if (!m_element.hasAudio() && !m_element.hasEverHadAudio()) {
         LOG(Media, "MediaElementSession::canShowControlsManager - returning FALSE: No audio");
         return false;
@@ -260 +259 @@
     }
 
-    if (hasBehaviorRestriction(RequirePlaybackToControlControlsManager) && !m_element.isPlaying()) {
+    if (purpose == PlaybackControlsPurpose::ControlsManager && hasBehaviorRestriction(RequirePlaybackToControlControlsManager) && !m_element.isPlaying()) {
         LOG(Media, "MediaElementSession::canShowControlsManager - returning FALSE: Needs to be playing");
         return false;
@@ -275 +274 @@
     }
 
-    if (m_element.isVideo()) {
+    // Only allow the main content heuristic to forbid videos from showing up if our purpose is the controls manager.
+    if (purpose == PlaybackControlsPurpose::ControlsManager && m_element.isVideo()) {
         if (!m_element.renderer()) {
             LOG(Media, "MediaElementSession::canShowControlsManager - returning FALSE: No renderer");
@@ -281 +281 @@
         }
 
-        if (purpose == PlaybackControlsPurpose::ControlsManager && !m_element.hasVideo() && !m_element.hasEverHadVideo()) {
+        if (!m_element.hasVideo() && !m_element.hasEverHadVideo()) {
             LOG(Media, "MediaElementSession::canShowControlsManager - returning FALSE: No video");
             return false;
@@ -290 +290 @@
             return true;
         }
+    }
+
+    if (purpose == PlaybackControlsPurpose::NowPlaying) {
+        LOG(Media, "MediaElementSession::canShowControlsManager - returning TRUE: Potentially plays audio");
+        return true;
     }
 

branches/safari-602.2.14.0-branch/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.mm

@@ -82 +82 @@
 
     LOG(Media, "MediaSessionManagerMac::sessionWillBeginPlayback");
-    updateNowPlayingInfo();
+    scheduleUpdateNowPlayingInfo();
     return true;
 }