Changeset 280568 in webkit

Timestamp:

Aug 2, 2021, 4:19:18 PM (5 years ago)

Author:

Jean-Yves Avenard

Message:

Crash in -[WKFullScreenWindowController windowDidExitFullScreen:]
​https://bugs.webkit.org/show_bug.cgi?id=228694
rdar://79569881

Reviewed by Jer Noble.

It appears that [WKFullScreenWindowController finishedEnterFullScreenAnimation] can
cause the retain count to be decreased (this is the only explanation that makes any
sense considering the crash and when the regression started following bug 227243).
No test, can't reproduce.

• UIProcess/mac/WKFullScreenWindowController.mm:

(-[WKFullScreenWindowController setVideoFullscreenManagerClient:]): Add utility method
to remove duplicated code.
(-[WKFullScreenWindowController didExitPictureInPicture]):
(-[WKFullScreenWindowController windowDidEnterFullScreen:]):
(-[WKFullScreenWindowController windowDidFailToExitFullScreen:]):
(-[WKFullScreenWindowController windowDidExitFullScreen:]):
(-[WKFullScreenWindowController _manager]): fly-by make style consistent with other
similar methods.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKFullScreenWindowController.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-02  Jean-Yves Avenard  <jya@apple.com>
+
+        Crash in -[WKFullScreenWindowController windowDidExitFullScreen:]
+        https://bugs.webkit.org/show_bug.cgi?id=228694
+        rdar://79569881
+
+        Reviewed by Jer Noble.
+
+        It appears that [WKFullScreenWindowController finishedEnterFullScreenAnimation] can
+        cause the retain count to be decreased (this is the only explanation that makes any
+        sense considering the crash and when the regression started following bug 227243).
+        No test, can't reproduce.
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController setVideoFullscreenManagerClient:]): Add utility method
+        to remove duplicated code.
+        (-[WKFullScreenWindowController didExitPictureInPicture]):
+        (-[WKFullScreenWindowController windowDidEnterFullScreen:]):
+        (-[WKFullScreenWindowController windowDidFailToExitFullScreen:]):
+        (-[WKFullScreenWindowController windowDidExitFullScreen:]):
+        (-[WKFullScreenWindowController _manager]): fly-by make style consistent with other
+        similar methods.
+
 2021-08-02  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm

@@ -646 +646 @@
 }
 
-- (void)didExitPictureInPicture
+- (void)setVideoFullscreenManagerClient:(WebKit::VideoFullscreenManagerProxyClient *)client
 {
     if (auto* videoFullscreenManager = self._videoFullscreenManager) {
         ASSERT(videoFullscreenManager->client() == &_videoFullscreenManagerProxyClient);
-        videoFullscreenManager->setClient(nullptr);
+        videoFullscreenManager->setClient(client);
     }
+}
+
+- (void)didExitPictureInPicture
+{
+    [self setVideoFullscreenManagerClient:nullptr];
 }
 
@@ -684 +689 @@
 - (void)windowDidEnterFullScreen:(NSNotification *)notification
 {
+    RetainPtr<WKFullScreenWindowController> retain = self;
     [self finishedEnterFullScreenAnimation:YES];
-
-    if (auto* videoFullscreenManager = self._videoFullscreenManager) {
-        ASSERT(videoFullscreenManager->client() == nullptr);
-        videoFullscreenManager->setClient(&_videoFullscreenManagerProxyClient);
-    }
+    [self setVideoFullscreenManagerClient:&_videoFullscreenManagerProxyClient];
 }
 
 - (void)windowDidFailToExitFullScreen:(NSWindow *)window
 {
+    RetainPtr<WKFullScreenWindowController> retain = self;
     [self finishedExitFullScreenAnimation:NO];
+    [self setVideoFullscreenManagerClient:nullptr];
 }
 
 - (void)windowDidExitFullScreen:(NSNotification *)notification
 {
+    RetainPtr<WKFullScreenWindowController> retain = self;
     [self finishedExitFullScreenAnimation:YES];
-
-    if (auto* videoFullscreenManager = self._videoFullscreenManager) {
-        ASSERT(videoFullscreenManager->client() == &_videoFullscreenManagerProxyClient);
-        videoFullscreenManager->setClient(nullptr);
-    }
+    [self setVideoFullscreenManagerClient:nullptr];
 }
 
@@ -719 +720 @@
     if (!_page)
         return nullptr;
+
     return _page->fullScreenManager();
 }