76 lines
3.0 KiB
Diff
76 lines
3.0 KiB
Diff
diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc
|
|
index 646dcfb16bf03..83a3b61d93d5a 100644
|
|
--- base/message_loop/message_pump_win.cc
|
|
+++ base/message_loop/message_pump_win.cc
|
|
@@ -2,6 +2,7 @@
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
+#include "base/task/current_thread.h"
|
|
#include "base/message_loop/message_pump_win.h"
|
|
|
|
#include <algorithm>
|
|
@@ -491,7 +492,17 @@ bool MessagePumpForUI::ProcessNextWindowsMessage() {
|
|
ctx.event()->set_chrome_message_pump();
|
|
msg_pump_data->set_sent_messages_in_queue(more_work_is_plausible);
|
|
});
|
|
- has_msg = ::PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE) != FALSE;
|
|
+
|
|
+ // We should not process all window messages if we are in the context of an
|
|
+ // OS modal loop, i.e. in the context of a windows API call like MessageBox.
|
|
+ // This is to ensure that these messages are peeked out by the OS modal loop.
|
|
+ if (CurrentThread::Get()->os_modal_loop()) {
|
|
+ // We only peek out WM_PAINT and WM_TIMER here for reasons mentioned above.
|
|
+ has_msg = PeekMessage(&msg, NULL, WM_PAINT, WM_PAINT, PM_REMOVE) ||
|
|
+ PeekMessage(&msg, NULL, WM_TIMER, WM_TIMER, PM_REMOVE);
|
|
+ } else {
|
|
+ has_msg = PeekMessage(&msg, NULL, 0, 0, PM_REMOVE) != FALSE;
|
|
+ }
|
|
}
|
|
}
|
|
if (has_msg)
|
|
diff --git base/task/current_thread.cc base/task/current_thread.cc
|
|
index 4382f7258fd4e..d28b1e3de31a5 100644
|
|
--- base/task/current_thread.cc
|
|
+++ base/task/current_thread.cc
|
|
@@ -49,6 +49,8 @@ void CurrentThread::AddDestructionObserver(
|
|
|
|
void CurrentThread::RemoveDestructionObserver(
|
|
DestructionObserver* destruction_observer) {
|
|
+ if (!current_)
|
|
+ return;
|
|
DCHECK(current_->IsBoundToCurrentThread());
|
|
current_->RemoveDestructionObserver(destruction_observer);
|
|
}
|
|
diff --git base/task/current_thread.h base/task/current_thread.h
|
|
index 0375681bdbc2a..fad14b9ade013 100644
|
|
--- base/task/current_thread.h
|
|
+++ base/task/current_thread.h
|
|
@@ -132,6 +132,12 @@ class BASE_EXPORT CurrentThread {
|
|
// with a null callback to clear any potentially pending callbacks.
|
|
void RegisterOnNextIdleCallback(OnceClosure on_next_idle_callback);
|
|
|
|
+#if BUILDFLAG(IS_WIN)
|
|
+ void set_os_modal_loop(bool os_modal_loop) { os_modal_loop_ = os_modal_loop; }
|
|
+
|
|
+ bool os_modal_loop() const { return os_modal_loop_; }
|
|
+#endif // OS_WIN
|
|
+
|
|
// Enables nested task processing in scope of an upcoming native message loop.
|
|
// Some unwanted message loops may occur when using common controls or printer
|
|
// functions. Hence, nested task processing is disabled by default to avoid
|
|
@@ -202,6 +208,13 @@ class BASE_EXPORT CurrentThread {
|
|
friend class web::WebTaskEnvironment;
|
|
|
|
raw_ptr<sequence_manager::internal::SequenceManagerImpl> current_;
|
|
+
|
|
+#if BUILDFLAG(IS_WIN)
|
|
+ private:
|
|
+ // Should be set to true before calling Windows APIs like TrackPopupMenu, etc.
|
|
+ // which enter a modal message loop.
|
|
+ bool os_modal_loop_ = false;
|
|
+#endif
|
|
};
|
|
|
|
#if !BUILDFLAG(IS_NACL)
|