mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-13 10:06:28 +01:00
725ed88529
- Windows: 10.0.17763.0 SDK is now required. - Mac: 10.13 SDK is now required. - Removed CefRequestContext::ResolveHostCached which is no longer supported by Chromium.
25 lines
957 B
Diff
25 lines
957 B
Diff
diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
|
|
index 666b6cdca80b..239f6fad81a1 100644
|
|
--- base/message_loop/message_pump_mac.mm
|
|
+++ base/message_loop/message_pump_mac.mm
|
|
@@ -800,7 +800,8 @@ void MessagePumpUIApplication::Attach(Delegate* delegate) {
|
|
#else
|
|
|
|
ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
|
|
- DCHECK(g_app_pump);
|
|
+ if (!g_app_pump)
|
|
+ return;
|
|
DCHECK_EQ(kNSApplicationModalSafeModeMask, g_app_pump->GetModeMask());
|
|
// Pumping events in private runloop modes is known to interact badly with
|
|
// app modal windows like NSAlert.
|
|
@@ -812,7 +813,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
|
|
}
|
|
|
|
ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() {
|
|
- DCHECK(g_app_pump);
|
|
+ if (!g_app_pump)
|
|
+ return;
|
|
g_app_pump->SetModeMask(kNSApplicationModalSafeModeMask);
|
|
g_app_pump->SetTimerInvalidationAllowed(true);
|
|
}
|