Changeset 279352 in webkit

Timestamp:

Jun 28, 2021, 4:56:54 PM (5 years ago)

Author:

Brent Fulgham

Message:

REGRESSION (r279305) [Mac DEBUG] 4 SOAuthorizationRedirect Tests are Crashing with Assert: !m_sheetWindow
​https://bugs.webkit.org/show_bug.cgi?id=227454
<rdar://problem/79871423>

Reviewed by Kate Cheney.

The new assertion is wrong in the case that the app is hidden. When minimized (or hidden) we need to remember
to dismiss the sheet once Cocoa restores the app to visible state. So the m_sheetWindow may still exist after
returning from 'dismissViewController'. We should assert that either m_sheetWindow is nullptr, or that both
m_sheetWindow and m_sheetWindowWillCloseObserver exist.

• UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm:

(WebKit::SOAuthorizationSession::becomeCompleted):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-06-28  Brent Fulgham  <bfulgham@apple.com>
+
+        REGRESSION (r279305) [Mac DEBUG] 4 SOAuthorizationRedirect Tests are Crashing with Assert: !m_sheetWindow
+        https://bugs.webkit.org/show_bug.cgi?id=227454
+        <rdar://problem/79871423>
+
+        Reviewed by Kate Cheney.
+
+        The new assertion is wrong in the case that the app is hidden. When minimized (or hidden) we need to remember
+        to dismiss the sheet once Cocoa restores the app to visible state. So the m_sheetWindow may still exist after
+        returning from 'dismissViewController'. We should assert that either m_sheetWindow is nullptr, or that both
+        m_sheetWindow and m_sheetWindowWillCloseObserver exist. 
+
+        * UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm:
+        (WebKit::SOAuthorizationSession::becomeCompleted):
+
 2021-06-28  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm

@@ -151 +151 @@
     dismissViewController();
 #if PLATFORM(MAC)
-    ASSERT(!m_sheetWindow);
+    ASSERT(!m_sheetWindow || (m_sheetWindow && m_sheetWindowWillCloseObserver));
 #endif
 }