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

fix: ensure popup and closepopup are posted in order (#20114)

Browse source
This commit is contained in:
Shelley Vohr 2019-09-05 13:37:09 -07:00 • committed by John Kleinschmidt
parent 8a0a41b9ef
commit 20e3c519dd
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
shell/browser/api/atom_api_menu_mac.h
View file

@ -35,6 +35,7 @@ class MenuMac : public Menu {
int positioning_item, int positioning_item,
base::Closure callback); base::Closure callback);
void ClosePopupAt(int32_t window_id) override; void ClosePopupAt(int32_t window_id) override;
void ClosePopupOnUI(int32_t window_id);
private: private:
friend class Menu; friend class Menu;

9
shell/browser/api/atom_api_menu_mac.mm
View file

@ -48,7 +48,7 @@ void MenuMac::PopupAt(TopLevelWindow* window,
base::BindOnce(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(), base::BindOnce(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
native_window->GetWeakPtr(), window->weak_map_id(), x, y, native_window->GetWeakPtr(), window->weak_map_id(), x, y,
positioning_item, callback); positioning_item, callback);
base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, std::move(popup)); base::SequencedTaskRunnerHandle::Get()->PostTask(FROM_HERE, std::move(popup));
} }
void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window, void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
@ -117,6 +117,13 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
} }
void MenuMac::ClosePopupAt(int32_t window_id) { void MenuMac::ClosePopupAt(int32_t window_id) {
auto close_popup = base::BindOnce(&MenuMac::ClosePopupOnUI,
weak_factory_.GetWeakPtr(), window_id);
base::SequencedTaskRunnerHandle::Get()->PostTask(FROM_HERE,
std::move(close_popup));
}
void MenuMac::ClosePopupOnUI(int32_t window_id) {
auto controller = popup_controllers_.find(window_id); auto controller = popup_controllers_.find(window_id);
if (controller != popup_controllers_.end()) { if (controller != popup_controllers_.end()) {
// Close the controller for the window. // Close the controller for the window.