mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

ScopedNestableTaskAllower in MessageLoopCurrent

Browse source 
https://chromium-review.googlesource.com/c/chromium/src/+/1020288
This commit is contained in:
Jeremy Apthorp 2019-01-09 12:10:26 -08:00
parent 30e5e993c1
commit 8948e27ced
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_menu_mac.mm
View file

@ -99,7 +99,7 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
[popup_controllers_[window_id] setCloseCallback:close_callback]; [popup_controllers_[window_id] setCloseCallback:close_callback];
// Make sure events can be pumped while the menu is up. // Make sure events can be pumped while the menu is up.
base::MessageLoop::ScopedNestableTaskAllower allow; base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
// One of the events that could be pumped is |window.close()|. // One of the events that could be pumped is |window.close()|.
// User-initiated event-tracking loops protect against this by // User-initiated event-tracking loops protect against this by

2
atom/browser/api/atom_api_web_contents.cc
View file

@ -1793,7 +1793,7 @@ void WebContents::StartDrag(const mate::Dictionary& item,
// Start dragging. // Start dragging.
if (!files.empty()) { if (!files.empty()) {
base::MessageLoop::ScopedNestableTaskAllower allow; base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
DragFileItems(files, icon->image(), web_contents()->GetNativeView()); DragFileItems(files, icon->image(), web_contents()->GetNativeView());
} else { } else {
args->ThrowError("Must specify either 'file' or 'files' option"); args->ThrowError("Must specify either 'file' or 'files' option");