Title: [220026] branches/safari-604-branch/Source/WebCore
Revision
220026
Author
[email protected]
Date
2017-07-28 15:19:59 -0700 (Fri, 28 Jul 2017)

Log Message

Cherry-pick r219991. rdar://problem/33595570

Modified Paths

Diff

Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220025 => 220026)


--- branches/safari-604-branch/Source/WebCore/ChangeLog	2017-07-28 22:19:56 UTC (rev 220025)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog	2017-07-28 22:19:59 UTC (rev 220026)
@@ -1,5 +1,26 @@
 2017-07-28  Jason Marcell  <[email protected]>
 
+        Cherry-pick r219991. rdar://problem/33595570
+
+    2017-07-27  Jeremy Jones  <[email protected]>
+
+            MediaDocument fullscreen pinch gesture should trigger navigate back.
+            https://bugs.webkit.org/show_bug.cgi?id=174914
+
+            Reviewed by Jon Lee.
+
+            No new tests because only effect is from interaction with platform.
+
+            For media documents, pressing the "done" button on fullscreen video navigates back
+            to the previous page. The same should happen for other gestures that pause playback
+            when returning to inline. This allows the gesture to have the same behavior as the
+            button.
+
+            * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+            (WebVideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason):
+
+2017-07-28  Jason Marcell  <[email protected]>
+
         Cherry-pick r219950. rdar://problem/33595459
 
     2017-07-26  Chris Dumez  <[email protected]>

Modified: branches/safari-604-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (220025 => 220026)


--- branches/safari-604-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2017-07-28 22:19:56 UTC (rev 220025)
+++ branches/safari-604-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2017-07-28 22:19:59 UTC (rev 220026)
@@ -989,9 +989,10 @@
 
     if (webPlaybackSessionModel() && (reason == ExitFullScreenReason::DoneButtonTapped || reason == ExitFullScreenReason::RemoteControlStopEventReceived))
         webPlaybackSessionModel()->pause();
-    
-    m_videoFullscreenModel->requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenModeNone, reason == ExitFullScreenReason::DoneButtonTapped);
 
+    BOOL finished = reason == ExitFullScreenReason::DoneButtonTapped || reason == ExitFullScreenReason::PinchGestureHandled;
+    m_videoFullscreenModel->requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenModeNone, finished);
+
     if (!m_watchdogTimer.isActive())
         m_watchdogTimer.startOneShot(defaultWatchdogTimerInterval);
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to