Title: [279122] trunk/Source/WebKit
- Revision
- 279122
- Author
- [email protected]
- Date
- 2021-06-22 10:00:38 -0700 (Tue, 22 Jun 2021)
Log Message
ASSERTION FAILED: videoFullscreenManager->client() == nullptr in WKFullScreenWindowController.mm
https://bugs.webkit.org/show_bug.cgi?id=227243
Reviewed by Eric Carlson.
`-[WKFullScreenWindowController windowDidExitFullScreen:]` needs to clear
its client like `-[WKFullScreenWindowController didExitPictureInPicture]` does.
* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController windowDidExitFullScreen:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (279121 => 279122)
--- trunk/Source/WebKit/ChangeLog 2021-06-22 16:55:58 UTC (rev 279121)
+++ trunk/Source/WebKit/ChangeLog 2021-06-22 17:00:38 UTC (rev 279122)
@@ -1,3 +1,16 @@
+2021-06-22 Peng Liu <[email protected]>
+
+ ASSERTION FAILED: videoFullscreenManager->client() == nullptr in WKFullScreenWindowController.mm
+ https://bugs.webkit.org/show_bug.cgi?id=227243
+
+ Reviewed by Eric Carlson.
+
+ `-[WKFullScreenWindowController windowDidExitFullScreen:]` needs to clear
+ its client like `-[WKFullScreenWindowController didExitPictureInPicture]` does.
+
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController windowDidExitFullScreen:]):
+
2021-06-22 Truitt Savell <[email protected]>
Unreviewed, reverting r279083.
Modified: trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm (279121 => 279122)
--- trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm 2021-06-22 16:55:58 UTC (rev 279121)
+++ trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm 2021-06-22 17:00:38 UTC (rev 279122)
@@ -698,6 +698,11 @@
- (void)windowDidExitFullScreen:(NSNotification *)notification
{
[self finishedExitFullScreenAnimation:YES];
+
+ if (auto* videoFullscreenManager = self._videoFullscreenManager) {
+ ASSERT(videoFullscreenManager->client() == &_videoFullscreenManagerProxyClient);
+ videoFullscreenManager->setClient(nullptr);
+ }
}
- (NSWindow *)destinationWindowToExitFullScreenForWindow:(NSWindow *)window
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
