Title: [232554] tags/Safari-606.1.20/Source/WebKit
Revision
232554
Author
[email protected]
Date
2018-06-06 13:13:16 -0700 (Wed, 06 Jun 2018)

Log Message

Cherry-pick r232548. rdar://problem/40838449

    REGRESSION (r232301) - Unable to enter video fullscreen
    https://bugs.webkit.org/show_bug.cgi?id=186357
    <rdar://problem/40838449>

    Reviewed by Jon Lee.

    Only set up the standby fullscreen element if we are in element fullscreen.

    * WebProcess/FullScreen/WebFullScreenManager.cpp:
    (WebKit::WebFullScreenManager::videoControlsManagerDidChange):

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

Modified Paths

Diff

Modified: tags/Safari-606.1.20/Source/WebKit/ChangeLog (232553 => 232554)


--- tags/Safari-606.1.20/Source/WebKit/ChangeLog	2018-06-06 20:13:12 UTC (rev 232553)
+++ tags/Safari-606.1.20/Source/WebKit/ChangeLog	2018-06-06 20:13:16 UTC (rev 232554)
@@ -1,5 +1,35 @@
 2018-06-06  Kocsen Chung  <[email protected]>
 
+        Cherry-pick r232548. rdar://problem/40838449
+
+    REGRESSION (r232301) - Unable to enter video fullscreen
+    https://bugs.webkit.org/show_bug.cgi?id=186357
+    <rdar://problem/40838449>
+    
+    Reviewed by Jon Lee.
+    
+    Only set up the standby fullscreen element if we are in element fullscreen.
+    
+    * WebProcess/FullScreen/WebFullScreenManager.cpp:
+    (WebKit::WebFullScreenManager::videoControlsManagerDidChange):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232548 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-06-06  Jer Noble  <[email protected]>
+
+            REGRESSION (r232301) - Unable to enter video fullscreen
+            https://bugs.webkit.org/show_bug.cgi?id=186357
+            <rdar://problem/40838449>
+
+            Reviewed by Jon Lee.
+
+            Only set up the standby fullscreen element if we are in element fullscreen.
+
+            * WebProcess/FullScreen/WebFullScreenManager.cpp:
+            (WebKit::WebFullScreenManager::videoControlsManagerDidChange):
+
+2018-06-06  Kocsen Chung  <[email protected]>
+
         Revert r232528. rdar://problem/40858098
 
 2018-06-05  Per Arne Vollan  <[email protected]>

Modified: tags/Safari-606.1.20/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.cpp (232553 => 232554)


--- tags/Safari-606.1.20/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.cpp	2018-06-06 20:13:12 UTC (rev 232553)
+++ tags/Safari-606.1.20/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.cpp	2018-06-06 20:13:16 UTC (rev 232554)
@@ -89,7 +89,12 @@
 {
 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
     auto* currentPlaybackControlsElement = m_page->playbackSessionManager().currentPlaybackControlsElement();
-    setPIPStandbyElement(is<HTMLVideoElement>(currentPlaybackControlsElement) ? downcast<HTMLVideoElement>(currentPlaybackControlsElement) : nullptr);
+    if (!m_element || !is<HTMLVideoElement>(currentPlaybackControlsElement)) {
+        setPIPStandbyElement(nullptr);
+        return;
+    }
+
+    setPIPStandbyElement(downcast<HTMLVideoElement>(currentPlaybackControlsElement));
 #endif
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to