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

electron · Sep 5, 2019 · 20e3c51 · 20e3c51
1 parent 8a0a41b
commit 20e3c51
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/shell/browser/api/atom_api_menu_mac.h b/shell/browser/api/atom_api_menu_mac.h
@@ -35,6 +35,7 @@ class MenuMac : public Menu {
                  int positioning_item,
                  base::Closure callback);
   void ClosePopupAt(int32_t window_id) override;
+  void ClosePopupOnUI(int32_t window_id);
 
  private:
   friend class Menu;

diff --git a/shell/browser/api/atom_api_menu_mac.mm b/shell/browser/api/atom_api_menu_mac.mm
@@ -48,7 +48,7 @@
       base::BindOnce(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
                      native_window->GetWeakPtr(), window->weak_map_id(), x, y,
                      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,
@@ -117,6 +117,13 @@
 }
 
 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);
   if (controller != popup_controllers_.end()) {
     // Close the controller for the window.