Changeset 254607 in webkit

Timestamp:

Jan 15, 2020, 11:15:34 AM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r254287. rdar://problem/58552886

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):

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

Location:

branches/safari-609-branch/Source/WebKit

Files:

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

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

@@ +1 @@
+2020-01-14  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r254287. rdar://problem/58552886
+
+    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):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254287 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-14  Alan Coon  <alancoon@apple.com>
 

branches/safari-609-branch/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)));