Title: [204310] branches/safari-602.1.50.1-branch/Source/WebCore
- Revision
- 204310
- Author
- [email protected]
- Date
- 2016-08-09 15:25:37 -0700 (Tue, 09 Aug 2016)
Log Message
Merge r204274. rdar://problem/27688892
Modified Paths
Diff
Modified: branches/safari-602.1.50.1-branch/Source/WebCore/ChangeLog (204309 => 204310)
--- branches/safari-602.1.50.1-branch/Source/WebCore/ChangeLog 2016-08-09 22:20:39 UTC (rev 204309)
+++ branches/safari-602.1.50.1-branch/Source/WebCore/ChangeLog 2016-08-09 22:25:37 UTC (rev 204310)
@@ -1,3 +1,21 @@
+2016-08-09 Babak Shafiei <[email protected]>
+
+ Merge r204274. rdar://problem/27688892
+
+ 2016-08-08 Jeremy Jones <[email protected]>
+
+ Clear fullscreen mode state after exiting fullscreen mode to keep state in sync.
+ https://bugs.webkit.org/show_bug.cgi?id=160668
+
+ Reviewed by Jon Lee.
+
+ When exiting fullscreen while in auto picture in picture mode, fullscreen mode gets
+ out of sync, causing exit fullscreen to fail. This change updates the state
+ to keep it correct.
+
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebVideoFullscreenInterfaceAVKit::exitFullscreen):
+
2016-08-05 Babak Shafiei <[email protected]>
Merge r204210. rdar://problem/27592694
Modified: branches/safari-602.1.50.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (204309 => 204310)
--- branches/safari-602.1.50.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2016-08-09 22:20:39 UTC (rev 204309)
+++ branches/safari-602.1.50.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2016-08-09 22:25:37 UTC (rev 204310)
@@ -776,6 +776,7 @@
} else if (isMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture | HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
RefPtr<WebVideoFullscreenInterfaceAVKit> protectedThis(this);
[m_playerViewController exitFullScreenAnimated:NO completionHandler:[protectedThis, this] (BOOL, NSError*) {
+ clearMode(HTMLMediaElementEnums::VideoFullscreenModeStandard);
[m_window setHidden:NO];
[m_playerViewController stopPictureInPicture];
}];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
