Changeset 271273 in webkit

Timestamp:

Jan 7, 2021, 4:30:58 PM (6 years ago)

Author:

Peng Liu

Message:

PlaybackSessionManager::m_clientCounts is not updated correctly when a video enters picture-in-picture from fullscreen
​https://bugs.webkit.org/show_bug.cgi?id=220435

Reviewed by Eric Carlson.

• WebProcess/cocoa/VideoFullscreenManager.mm:

(WebKit::VideoFullscreenManager::enterVideoFullscreenForVideoElement):
When a fullscreen video enters picture-in-picture, we should not call addClientForContext()
because m_clientCounts was updated when the video entered fullscreen.
(WebKit::VideoFullscreenManager::exitVideoFullscreenToModeWithoutAnimation):
We need to call removeClientForContext() in this function like didCleanupFullscreen() does.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/cocoa/VideoFullscreenManager.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-07  Peng Liu  <peng.liu6@apple.com>
+
+        PlaybackSessionManager::m_clientCounts is not updated correctly when a video enters picture-in-picture from fullscreen
+        https://bugs.webkit.org/show_bug.cgi?id=220435
+
+        Reviewed by Eric Carlson.
+
+        * WebProcess/cocoa/VideoFullscreenManager.mm:
+        (WebKit::VideoFullscreenManager::enterVideoFullscreenForVideoElement):
+        When a fullscreen video enters picture-in-picture, we should not call `addClientForContext()`
+        because `m_clientCounts` was updated when the video entered fullscreen.
+        (WebKit::VideoFullscreenManager::exitVideoFullscreenToModeWithoutAnimation):
+        We need to call `removeClientForContext()` in this function like `didCleanupFullscreen()` does.
+
 2021-01-07  Eric Carlson  <eric.carlson@apple.com>
 

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

@@ -251 +251 @@
     HTMLMediaElementEnums::VideoFullscreenMode oldMode = interface->fullscreenMode();
 
-    addClientForContext(contextId);
+    if (oldMode == HTMLMediaElementEnums::VideoFullscreenModeNone)
+        addClientForContext(contextId);
+
     if (!interface->layerHostingContext())
         interface->setLayerHostingContext(LayerHostingContext::createForExternalHostingProcess());
@@ -330 +332 @@
 
     interface.setTargetIsFullscreen(false);
+    removeClientForContext(contextId);
 
     m_page->send(Messages::VideoFullscreenManagerProxy::ExitFullscreenWithoutAnimationToMode(contextId, targetMode));