Changeset 271737 in webkit

Timestamp:

Jan 21, 2021 10:11:21 PM (18 months ago)

Author:

Peng Liu

Message:

PiP video subtitles stop updating when Safari is backgrounded
​https://bugs.webkit.org/show_bug.cgi?id=220660

Reviewed by Darin Adler.

Subtitles in the picture-in-picture window will stop updating when the browser is
in the background because we freeze the layer tree when a browser is in the background.
This patch fixes this issue by avoiding freezing the layer tree if a video is playing
in picture-in-picture when the browser is in the background.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updateDrawingAreaLayerTreeFreezeState):

• WebProcess/cocoa/VideoFullscreenManager.h:
• WebProcess/cocoa/VideoFullscreenManager.mm:

(WebKit::VideoFullscreenManager::videoInPictureInPicture const):
(WebKit::VideoFullscreenManager::enterVideoFullscreenForVideoElement):
(WebKit::VideoFullscreenManager::exitVideoFullscreenForVideoElement):
(WebKit::VideoFullscreenManager::exitVideoFullscreenToModeWithoutAnimation):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/cocoa/VideoFullscreenManager.h (modified) (2 diffs)
• WebProcess/cocoa/VideoFullscreenManager.mm (modified) (7 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-21  Peng Liu  <peng.liu6@apple.com>
+
+        PiP video subtitles stop updating when Safari is backgrounded
+        https://bugs.webkit.org/show_bug.cgi?id=220660
+
+        Reviewed by Darin Adler.
+
+        Subtitles in the picture-in-picture window will stop updating when the browser is
+        in the background because we freeze the layer tree when a browser is in the background.
+        This patch fixes this issue by avoiding freezing the layer tree if a video is playing
+        in picture-in-picture when the browser is in the background.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updateDrawingAreaLayerTreeFreezeState):
+        * WebProcess/cocoa/VideoFullscreenManager.h:
+        * WebProcess/cocoa/VideoFullscreenManager.mm:
+        (WebKit::VideoFullscreenManager::videoInPictureInPicture const):
+        (WebKit::VideoFullscreenManager::enterVideoFullscreenForVideoElement):
+        (WebKit::VideoFullscreenManager::exitVideoFullscreenForVideoElement):
+        (WebKit::VideoFullscreenManager::exitVideoFullscreenToModeWithoutAnimation):
+
 2021-01-21  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -2644 +2644 @@
     if (!m_drawingArea)
         return;
+
+#if ENABLE(VIDEO_PRESENTATION_MODE)
+    // When the browser is in the background, we should not freeze the layer tree
+    // if the page has a video playing in picture-in-picture.
+    if (m_videoFullscreenManager && m_videoFullscreenManager->hasVideoPlayingInPictureInPicture() && m_layerTreeFreezeReasons.hasExactlyOneBitSet() && m_layerTreeFreezeReasons.contains(LayerTreeFreezeReason::BackgroundApplication)) {
+        m_drawingArea->setLayerTreeStateIsFrozen(false);
+        return;
+    }
+#endif
+
     m_drawingArea->setLayerTreeStateIsFrozen(!!m_layerTreeFreezeReasons);
 }

trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.h

@@ -118 +118 @@
     
     void invalidate();
-    
+
+    bool hasVideoPlayingInPictureInPicture() const;
+
     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
 
@@ -170 +172 @@
     PlaybackSessionContextIdentifier m_controlsManagerContextId;
     HashMap<PlaybackSessionContextIdentifier, int> m_clientCounts;
+    WeakPtr<WebCore::HTMLVideoElement> m_videoElementInPictureInPicture;
 };
 

trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm

@@ -149 +149 @@
 }
 
+bool VideoFullscreenManager::hasVideoPlayingInPictureInPicture() const
+{
+    return !!m_videoElementInPictureInPicture;
+}
+
 VideoFullscreenManager::ModelInterfaceTuple VideoFullscreenManager::createModelAndInterface(PlaybackSessionContextIdentifier contextId)
 {
@@ -266 +271 @@
         interface->setTargetIsFullscreen(false);
 
+    if (mode == HTMLMediaElementEnums::VideoFullscreenModePictureInPicture)
+        m_videoElementInPictureInPicture = makeWeakPtr(videoElement);
+
     interface->setFullscreenMode(mode);
     interface->setFullscreenStandby(standby);
@@ -296 +304 @@
 }
 
-void VideoFullscreenManager::exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement& videoElement, CompletionHandler<void(bool)>&& completionHandler)
+void VideoFullscreenManager::exitVideoFullscreenForVideoElement(HTMLVideoElement& videoElement, CompletionHandler<void(bool)>&& completionHandler)
 {
     LOG(Fullscreen, "VideoFullscreenManager::exitVideoFullscreenForVideoElement(%p)", this);
@@ -309 +317 @@
     }
 
-    m_page->sendWithAsyncReply(Messages::VideoFullscreenManagerProxy::ExitFullscreen(contextId, inlineVideoFrame(videoElement)), [protectedThis = makeRefPtr(this), this, contextId, completionHandler = WTFMove(completionHandler)](auto success) mutable {
+    m_page->sendWithAsyncReply(Messages::VideoFullscreenManagerProxy::ExitFullscreen(contextId, inlineVideoFrame(videoElement)), [protectedThis = makeRefPtr(this), this, contextId, videoElementPtr = &videoElement, completionHandler = WTFMove(completionHandler)](auto success) mutable {
         if (!success) {
             completionHandler(false);
@@ -315 +323 @@
         }
 
+        if (m_videoElementInPictureInPicture == videoElementPtr)
+            m_videoElementInPictureInPicture = nullptr;
+
         auto& interface = ensureInterface(contextId);
         interface.setTargetIsFullscreen(false);
@@ -322 +333 @@
 }
 
-void VideoFullscreenManager::exitVideoFullscreenToModeWithoutAnimation(WebCore::HTMLVideoElement& videoElement, WebCore::HTMLMediaElementEnums::VideoFullscreenMode targetMode)
+void VideoFullscreenManager::exitVideoFullscreenToModeWithoutAnimation(HTMLVideoElement& videoElement, WebCore::HTMLMediaElementEnums::VideoFullscreenMode targetMode)
 {
     LOG(Fullscreen, "VideoFullscreenManager::exitVideoFullscreenToModeWithoutAnimation(%p)", this);
@@ -328 +339 @@
     ASSERT(m_page);
     ASSERT(m_videoElements.contains(&videoElement));
+
+    if (m_videoElementInPictureInPicture == &videoElement)
+        m_videoElementInPictureInPicture = nullptr;
 
     auto contextId = m_videoElements.get(&videoElement);