Title: [193358] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 193358
- Author
- matthew_han...@apple.com
- Date
- 2015-12-03 11:41:23 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r192922. rdar://problem/23726466
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193357 => 193358)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-03 19:41:19 UTC (rev 193357)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-03 19:41:23 UTC (rev 193358)
@@ -1,3 +1,19 @@
+2015-12-02 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r192922. rdar://problem/23726466
+
+ 2015-12-01 Jer Noble <jer.no...@apple.com>
+
+ [iOS] Abrupt transition between Fullscreen -> PiP
+ https://bugs.webkit.org/show_bug.cgi?id=151719
+
+ Reviewed by Eric Carlson.
+
+ Rather than abruptly hiding the fullscreen window, explicitly exit fullscreen mode upon entering PiP.
+
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebVideoFullscreenInterfaceAVKit::didStartPictureInPicture):
+
2015-12-01 Matthew Hanson <matthew_han...@apple.com>
Merge r192259. rdar://problem/23189749
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (193357 => 193358)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-12-03 19:41:19 UTC (rev 193357)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-12-03 19:41:23 UTC (rev 193358)
@@ -1318,9 +1318,17 @@
{
LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::didStartPictureInPicture(%p)", this);
[m_playerViewController setShowsPlaybackControls:YES];
- [m_window setHidden:YES];
- [[m_playerViewController view] setHidden:YES];
+ if (m_mode & HTMLMediaElementEnums::VideoFullscreenModeStandard) {
+ clearMode(HTMLMediaElementEnums::VideoFullscreenModeStandard);
+
+ RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
+ [m_playerViewController exitFullScreenAnimated:YES completionHandler:[strongThis, this] (BOOL, NSError*) {
+ [m_window setHidden:YES];
+ [[m_playerViewController view] setHidden:YES];
+ }];
+ }
+
if (m_fullscreenChangeObserver)
m_fullscreenChangeObserver->didEnterFullscreen();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
