Changeset 254287 in webkit

Timestamp:

Jan 9, 2020, 12:08:23 PM (7 years ago)

Author:

Peng Liu

Message:

Fullscreen videos do not enter PiP in first tap
​https://bugs.webkit.org/show_bug.cgi?id=205986

Reviewed by Eric Carlson.

This patch essentially reverts the fix for webkit.org/b/204461.
The fix for webkit.org/b/204461 depends on a fix in AVKit along
with a corresponding update in WebKit (webkit.org/b/204979).
We will need to reapply the fix for webkit.org/b/204461 after they are landed.

• WebProcess/cocoa/VideoFullscreenManager.mm:

(WebKit::VideoFullscreenManager::enterVideoFullscreenForVideoElement):
(WebKit::VideoFullscreenManager::exitVideoFullscreenForVideoElement):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-01-09  Peng Liu  <peng.liu6@apple.com>
+
+        Fullscreen videos do not enter PiP in first tap
+        https://bugs.webkit.org/show_bug.cgi?id=205986
+
+        Reviewed by Eric Carlson.
+
+        This patch essentially reverts the fix for webkit.org/b/204461.
+        The fix for webkit.org/b/204461 depends on a fix in AVKit along
+        with a corresponding update in WebKit (webkit.org/b/204979).
+        We will need to reapply the fix for webkit.org/b/204461 after they are landed.
+
+        * WebProcess/cocoa/VideoFullscreenManager.mm:
+        (WebKit::VideoFullscreenManager::enterVideoFullscreenForVideoElement):
+        (WebKit::VideoFullscreenManager::exitVideoFullscreenForVideoElement):
+
 2020-01-09  Kate Cheney  <katherine_cheney@apple.com>
 

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

@@ -250 +250 @@
     auto [model, interface] = ensureModelAndInterface(contextId);
     HTMLMediaElementEnums::VideoFullscreenMode oldMode = interface->fullscreenMode();
-    if (oldMode == mode)
-        return;
 
     addClientForContext(contextId);
@@ -300 +298 @@
     uint64_t contextId = m_videoElements.get(&videoElement);
     auto& interface = ensureInterface(contextId);
-    HTMLMediaElementEnums::VideoFullscreenMode oldMode = interface.fullscreenMode();
-    if (oldMode == HTMLMediaElementEnums::VideoFullscreenModeNone)
-        return;
-
     interface.setTargetIsFullscreen(false);
-
     if (interface.animationState() != VideoFullscreenInterfaceContext::AnimationType::None)
         return;
+
     interface.setAnimationState(VideoFullscreenInterfaceContext::AnimationType::FromFullscreen);
     m_page->send(Messages::VideoFullscreenManagerProxy::ExitFullscreen(contextId, inlineVideoFrame(videoElement)));