Title: [280628] trunk/Source/WebKit
- Revision
- 280628
- Author
- [email protected]
- Date
- 2021-08-03 22:36:03 -0700 (Tue, 03 Aug 2021)
Log Message
REGRESSION (r280568): ASSERTION FAILED: videoFullscreenManager->client() == &_videoFullscreenManagerProxyClient
https://bugs.webkit.org/show_bug.cgi?id=228740
rdar://problem/81464301
Reviewed by Jer Noble.
Fix assertion to reflect that the code can be code in two ways.
This will all go away following bug 228761.
* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController setVideoFullscreenManagerClient:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (280627 => 280628)
--- trunk/Source/WebKit/ChangeLog 2021-08-04 04:49:52 UTC (rev 280627)
+++ trunk/Source/WebKit/ChangeLog 2021-08-04 05:36:03 UTC (rev 280628)
@@ -1,3 +1,17 @@
+2021-08-03 Jean-Yves Avenard <[email protected]>
+
+ REGRESSION (r280568): ASSERTION FAILED: videoFullscreenManager->client() == &_videoFullscreenManagerProxyClient
+ https://bugs.webkit.org/show_bug.cgi?id=228740
+ rdar://problem/81464301
+
+ Reviewed by Jer Noble.
+
+ Fix assertion to reflect that the code can be code in two ways.
+ This will all go away following bug 228761.
+
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController setVideoFullscreenManagerClient:]):
+
2021-08-03 Ryan Haddad <[email protected]>
Unreviewed, reverting r280531 and r280589.
Modified: trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm (280627 => 280628)
--- trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm 2021-08-04 04:49:52 UTC (rev 280627)
+++ trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm 2021-08-04 05:36:03 UTC (rev 280628)
@@ -648,7 +648,7 @@
- (void)setVideoFullscreenManagerClient:(WebKit::VideoFullscreenManagerProxyClient *)client
{
if (auto* videoFullscreenManager = self._videoFullscreenManager) {
- ASSERT(videoFullscreenManager->client() == &_videoFullscreenManagerProxyClient);
+ ASSERT((client && !videoFullscreenManager->client()) || (!client && videoFullscreenManager->client() == &_videoFullscreenManagerProxyClient));
videoFullscreenManager->setClient(client);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
