Changeset 284837 in webkit

Timestamp:

Oct 25, 2021, 2:51:20 PM (5 years ago)

Author:

Alan Coon

Message:

Cherry-pick r284294. rdar://problem/84630302

[iOS] Screen Sharing doesn't switch to AirPlay when <video> enters fullscreen mode
​https://bugs.webkit.org/show_bug.cgi?id=231807
<rdar://82995799>

Reviewed by Eric Carlson.

WebKit will allow AVPlayer to switch to AirPlay Video mode from Screen Sharing when a
<video> element is in fullscreen mode. However, the fullscreen state this code depends on
is not stored in the GPU process.

Implement RemoteMediaPlayerProxy::mediaPlayerFullscreenMode()
and ::mediaPlayerIsVideoFullscreenStandby().

• GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::setVideoFullscreenMode): (WebKit::RemoteMediaPlayerProxy::videoFullscreenStandbyChanged): (WebKit::RemoteMediaPlayerProxy::mediaPlayerFullscreenMode const): (WebKit::RemoteMediaPlayerProxy::mediaPlayerIsVideoFullscreenStandby const):
• GPUProcess/media/RemoteMediaPlayerProxy.h:
• GPUProcess/media/RemoteMediaPlayerProxy.messages.in:
• WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp: (WebKit::MediaPlayerPrivateRemote::videoFullscreenStandbyChanged):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@284294 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-612-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• GPUProcess/media/RemoteMediaPlayerProxy.cpp (modified) (2 diffs)
• GPUProcess/media/RemoteMediaPlayerProxy.h (modified) (2 diffs)
• GPUProcess/media/RemoteMediaPlayerProxy.messages.in (modified) (1 diff)
• WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp (modified) (1 diff)

branches/safari-612-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-25  Null  <null@apple.com>
+
+        Cherry-pick r284294. rdar://problem/84630302
+
+    [iOS] Screen Sharing doesn't switch to AirPlay when <video> enters fullscreen mode
+    https://bugs.webkit.org/show_bug.cgi?id=231807
+    <rdar://82995799>
+    
+    Reviewed by Eric Carlson.
+    
+    WebKit will allow AVPlayer to switch to AirPlay Video mode from Screen Sharing when a
+    <video> element is in fullscreen mode. However, the fullscreen state this code depends on
+    is not stored in the GPU process.
+    
+    Implement RemoteMediaPlayerProxy::mediaPlayerFullscreenMode()
+    and ::mediaPlayerIsVideoFullscreenStandby().
+    
+    * GPUProcess/media/RemoteMediaPlayerProxy.cpp:
+    (WebKit::RemoteMediaPlayerProxy::setVideoFullscreenMode):
+    (WebKit::RemoteMediaPlayerProxy::videoFullscreenStandbyChanged):
+    (WebKit::RemoteMediaPlayerProxy::mediaPlayerFullscreenMode const):
+    (WebKit::RemoteMediaPlayerProxy::mediaPlayerIsVideoFullscreenStandby const):
+    * GPUProcess/media/RemoteMediaPlayerProxy.h:
+    * GPUProcess/media/RemoteMediaPlayerProxy.messages.in:
+    * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
+    (WebKit::MediaPlayerPrivateRemote::videoFullscreenStandbyChanged):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284294 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-15  Jer Noble  <jer.noble@apple.com>
+
+            [iOS] Screen Sharing doesn't switch to AirPlay when <video> enters fullscreen mode
+            https://bugs.webkit.org/show_bug.cgi?id=231807
+            <rdar://82995799>
+
+            Reviewed by Eric Carlson.
+
+            WebKit will allow AVPlayer to switch to AirPlay Video mode from Screen Sharing when a
+            <video> element is in fullscreen mode. However, the fullscreen state this code depends on
+            is not stored in the GPU process.
+
+            Implement RemoteMediaPlayerProxy::mediaPlayerFullscreenMode()
+            and ::mediaPlayerIsVideoFullscreenStandby().
+
+            * GPUProcess/media/RemoteMediaPlayerProxy.cpp:
+            (WebKit::RemoteMediaPlayerProxy::setVideoFullscreenMode):
+            (WebKit::RemoteMediaPlayerProxy::videoFullscreenStandbyChanged):
+            (WebKit::RemoteMediaPlayerProxy::mediaPlayerFullscreenMode const):
+            (WebKit::RemoteMediaPlayerProxy::mediaPlayerIsVideoFullscreenStandby const):
+            * GPUProcess/media/RemoteMediaPlayerProxy.h:
+            * GPUProcess/media/RemoteMediaPlayerProxy.messages.in:
+            * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
+            (WebKit::MediaPlayerPrivateRemote::videoFullscreenStandbyChanged):
+
 2021-10-25  Null  <null@apple.com>
 

branches/safari-612-branch/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp

@@ -320 +320 @@
 void RemoteMediaPlayerProxy::setVideoFullscreenMode(MediaPlayer::VideoFullscreenMode mode)
 {
+    m_fullscreenMode = mode;
     m_player->setVideoFullscreenMode(mode);
-
-}
-
-void RemoteMediaPlayerProxy::videoFullscreenStandbyChanged()
-{
+}
+
+void RemoteMediaPlayerProxy::videoFullscreenStandbyChanged(bool standby)
+{
+    m_videoFullscreenStandby = standby;
     m_player->videoFullscreenStandbyChanged();
 }
@@ -818 +819 @@
 MediaPlayerEnums::VideoFullscreenMode RemoteMediaPlayerProxy::mediaPlayerFullscreenMode() const
 {
-    notImplemented();
-    return MediaPlayerEnums::VideoFullscreenModeNone;
+    return m_fullscreenMode;
 }
 
 bool RemoteMediaPlayerProxy::mediaPlayerIsVideoFullscreenStandby() const
 {
-    notImplemented();
-    return false;
+    return m_videoFullscreenStandby;
 }
 #endif

branches/safari-612-branch/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h

@@ -104 +104 @@
     void updateVideoFullscreenInlineImage();
     void setVideoFullscreenMode(WebCore::MediaPlayer::VideoFullscreenMode);
-    void videoFullscreenStandbyChanged();
+    void videoFullscreenStandbyChanged(bool);
 #endif
 
@@ -355 +355 @@
     bool m_bufferedChanged { true };
     bool m_renderingCanBeAccelerated { false };
+    WebCore::MediaPlayer::VideoFullscreenMode m_fullscreenMode { WebCore::MediaPlayer::VideoFullscreenModeNone };
+    bool m_videoFullscreenStandby { false };
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(ENCRYPTED_MEDIA)

branches/safari-612-branch/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.messages.in

@@ -61 +61 @@
     SetVideoFullscreenMode(WebCore::MediaPlayer::VideoFullscreenMode mode)
     SetVideoFullscreenGravity(enum:uint8_t WebCore::MediaPlayerEnums::VideoGravity gravity)
-    VideoFullscreenStandbyChanged()
+    VideoFullscreenStandbyChanged(bool standby)
 #endif
 

branches/safari-612-branch/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp

@@ -851 +851 @@
 void MediaPlayerPrivateRemote::videoFullscreenStandbyChanged()
 {
-    connection().send(Messages::RemoteMediaPlayerProxy::VideoFullscreenStandbyChanged(), m_id);
+    RefPtr player = m_player.get();
+    if (!player)
+        return;
+
+    connection().send(Messages::RemoteMediaPlayerProxy::VideoFullscreenStandbyChanged(player->isVideoFullscreenStandby()), m_id);
 }
 #endif