Title: [279359] branches/safari-612.1.21-branch/Source/WebKit
- Revision
- 279359
- Author
- [email protected]
- Date
- 2021-06-28 18:35:50 -0700 (Mon, 28 Jun 2021)
Log 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
Modified Paths
Diff
Modified: branches/safari-612.1.21-branch/Source/WebKit/ChangeLog (279358 => 279359)
--- branches/safari-612.1.21-branch/Source/WebKit/ChangeLog 2021-06-29 01:34:20 UTC (rev 279358)
+++ branches/safari-612.1.21-branch/Source/WebKit/ChangeLog 2021-06-29 01:35:50 UTC (rev 279359)
@@ -1,3 +1,40 @@
+2021-06-28 Kocsen Chung <[email protected]>
+
+ 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 <[email protected]>
+
+ 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 <[email protected]>
Not all uses of AudioToolbox framework use soft linking
Modified: branches/safari-612.1.21-branch/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm (279358 => 279359)
--- branches/safari-612.1.21-branch/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm 2021-06-29 01:34:20 UTC (rev 279358)
+++ branches/safari-612.1.21-branch/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm 2021-06-29 01:35:50 UTC (rev 279359)
@@ -150,7 +150,7 @@
m_state = State::Completed;
dismissViewController();
#if PLATFORM(MAC)
- ASSERT(!m_sheetWindow);
+ ASSERT(!m_sheetWindow || (m_sheetWindow && m_sheetWindowWillCloseObserver));
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
