Title: [233112] trunk/Source/WebCore
- Revision
- 233112
- Author
- [email protected]
- Date
- 2018-06-22 17:15:51 -0700 (Fri, 22 Jun 2018)
Log Message
[Fullscreen] Restore ASSERT_NOT_REACHED() checks in exit fullscreen handler after r231924
https://bugs.webkit.org/show_bug.cgi?id=186945
<rdar://problem/37277469>
Reviewed by Simon Fraser.
* platform/ios/VideoFullscreenInterfaceAVKit.mm:
(VideoFullscreenInterfaceAVKit::exitFullscreen):
(VideoFullscreenInterfaceAVKit::exitFullscreenHandler):
(VideoFullscreenInterfaceAVKit::cleanupFullscreen):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (233111 => 233112)
--- trunk/Source/WebCore/ChangeLog 2018-06-23 00:09:37 UTC (rev 233111)
+++ trunk/Source/WebCore/ChangeLog 2018-06-23 00:15:51 UTC (rev 233112)
@@ -1,3 +1,16 @@
+2018-06-22 Jer Noble <[email protected]>
+
+ [Fullscreen] Restore ASSERT_NOT_REACHED() checks in exit fullscreen handler after r231924
+ https://bugs.webkit.org/show_bug.cgi?id=186945
+ <rdar://problem/37277469>
+
+ Reviewed by Simon Fraser.
+
+ * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+ (VideoFullscreenInterfaceAVKit::exitFullscreen):
+ (VideoFullscreenInterfaceAVKit::exitFullscreenHandler):
+ (VideoFullscreenInterfaceAVKit::cleanupFullscreen):
+
2018-06-22 Per Arne Vollan <[email protected]>
Unreviewed build fix on Windows.
Modified: trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm (233111 => 233112)
--- trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2018-06-23 00:09:37 UTC (rev 233111)
+++ trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2018-06-23 00:15:51 UTC (rev 233112)
@@ -1011,8 +1011,10 @@
}];
} else if (m_currentMode.isFullscreen()) {
[m_playerViewController exitFullScreenAnimated:YES completionHandler:[protectedThis = makeRefPtr(this), this] (BOOL success, NSError* error) mutable {
- if (!success)
+ if (!success) {
WTFLogAlways("-[AVPlayerViewController exitFullScreenAnimated:completionHandler:] failed with error %s", [[error localizedDescription] UTF8String]);
+ ASSERT_NOT_REACHED();
+ }
m_exitCompleted = true;
@@ -1047,8 +1049,10 @@
if (m_currentMode.hasFullscreen()) {
[[m_playerViewController view] layoutIfNeeded];
[m_playerViewController exitFullScreenAnimated:NO completionHandler:[] (BOOL success, NSError* error) {
- if (!success)
+ if (!success) {
WTFLogAlways("-[AVPlayerViewController exitFullScreenAnimated:completionHandler:] failed with error %s", [[error localizedDescription] UTF8String]);
+ ASSERT_NOT_REACHED();
+ }
}];
}
@@ -1790,8 +1794,10 @@
void VideoFullscreenInterfaceAVKit::exitFullscreenHandler(BOOL success, NSError* error)
{
- if (!success)
+ if (!success) {
WTFLogAlways("-[AVPlayerViewController exitFullScreenAnimated:completionHandler:] failed with error %s", [[error localizedDescription] UTF8String]);
+ ASSERT_NOT_REACHED();
+ }
LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::didExitFullscreen(%p) - %d", this, success);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
