Changeset 279359 in webkit

Timestamp:

Jun 28, 2021, 6:35:50 PM (5 years ago)

Author:

Alan Coon

Message:

Cherry-pick r279352. rdar://problem/79891891

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):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@279352 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-612.1.21-branch/Source/WebKit

Files:

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

branches/safari-612.1.21-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2021-06-28  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r279352. rdar://problem/79891891
+
+    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):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@279352 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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  Jean-Yves Avenard  <jya@apple.com>
 

branches/safari-612.1.21-branch/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm

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