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

fix: potential crash calling tray.popUpContextMenu() (#39231)

Browse source 
fix: potential crash calling tray.popUpContextMenu
This commit is contained in:
Shelley Vohr 2023-08-01 08:07:30 +02:00 • committed by GitHub
parent c8f7a0e052
commit 1f19a74417
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/api/electron_api_tray.cc
View file

@ -342,7 +342,9 @@ void Tray::PopUpContextMenu(gin::Arguments* args) {
} }
} }
} }
tray_icon_->PopUpContextMenu(pos, menu.IsEmpty() ? nullptr : menu->model());
tray_icon_->PopUpContextMenu(
pos, menu.IsEmpty() ? nullptr : menu->model()->GetWeakPtr());
} }
void Tray::CloseContextMenu() { void Tray::CloseContextMenu() {

2
shell/browser/ui/tray_icon.cc
View file

@ -21,7 +21,7 @@ void TrayIcon::RemoveBalloon() {}
void TrayIcon::Focus() {} void TrayIcon::Focus() {}
void TrayIcon::PopUpContextMenu(const gfx::Point& pos, void TrayIcon::PopUpContextMenu(const gfx::Point& pos,
raw_ptr<ElectronMenuModel> menu_model) {} base::WeakPtr<ElectronMenuModel> menu_model) {}
void TrayIcon::CloseContextMenu() {} void TrayIcon::CloseContextMenu() {}

2
shell/browser/ui/tray_icon.h
View file

@ -89,7 +89,7 @@ class TrayIcon {
// Popups the menu. // Popups the menu.
virtual void PopUpContextMenu(const gfx::Point& pos, virtual void PopUpContextMenu(const gfx::Point& pos,
raw_ptr<ElectronMenuModel> menu_model); base::WeakPtr<ElectronMenuModel> menu_model);
virtual void CloseContextMenu(); virtual void CloseContextMenu();

6
shell/browser/ui/tray_icon_cocoa.h
View file

@ -32,11 +32,11 @@ class TrayIconCocoa : public TrayIcon {
std::string GetTitle() override; std::string GetTitle() override;
void SetIgnoreDoubleClickEvents(bool ignore) override; void SetIgnoreDoubleClickEvents(bool ignore) override;
bool GetIgnoreDoubleClickEvents() override; bool GetIgnoreDoubleClickEvents() override;
void PopUpOnUI(ElectronMenuModel* menu_model); void PopUpOnUI(base::WeakPtr<ElectronMenuModel> menu_model);
void PopUpContextMenu(const gfx::Point& pos, void PopUpContextMenu(const gfx::Point& pos,
raw_ptr<ElectronMenuModel>) override; base::WeakPtr<ElectronMenuModel> menu_model) override;
void CloseContextMenu() override; void CloseContextMenu() override;
void SetContextMenu(raw_ptr<ElectronMenuModel>) override; void SetContextMenu(raw_ptr<ElectronMenuModel> menu_model) override;
gfx::Rect GetBounds() override; gfx::Rect GetBounds() override;
private: private:

20
shell/browser/ui/tray_icon_cocoa.mm
View file

@ -83,6 +83,11 @@
[self removeTrackingArea:trackingArea_]; [self removeTrackingArea:trackingArea_];
trackingArea_ = nil; trackingArea_ = nil;
} }
// Ensure any open menu is closed.
if ([statusItem_ menu])
[[statusItem_ menu] cancelTracking];
[[NSStatusBar systemStatusBar] removeStatusItem:statusItem_]; [[NSStatusBar systemStatusBar] removeStatusItem:statusItem_];
[self removeFromSuperview]; [self removeFromSuperview];
statusItem_ = nil; statusItem_ = nil;
@ -228,7 +233,6 @@
if (menuController_ && ![menuController_ isMenuOpen]) { if (menuController_ && ![menuController_ isMenuOpen]) {
// Ensure the UI can update while the menu is fading out. // Ensure the UI can update while the menu is fading out.
base::ScopedPumpMessagesInPrivateModes pump_private; base::ScopedPumpMessagesInPrivateModes pump_private;
[[statusItem_ button] performClick:self]; [[statusItem_ button] performClick:self];
} }
} }
@ -354,16 +358,16 @@ bool TrayIconCocoa::GetIgnoreDoubleClickEvents() {
return [status_item_view_ getIgnoreDoubleClickEvents]; return [status_item_view_ getIgnoreDoubleClickEvents];
} }
void TrayIconCocoa::PopUpOnUI(ElectronMenuModel* menu_model) { void TrayIconCocoa::PopUpOnUI(base::WeakPtr<ElectronMenuModel> menu_model) {
[status_item_view_ popUpContextMenu:menu_model]; [status_item_view_ popUpContextMenu:menu_model.get()];
} }
void TrayIconCocoa::PopUpContextMenu(const gfx::Point& pos, void TrayIconCocoa::PopUpContextMenu(
raw_ptr<ElectronMenuModel> menu_model) { const gfx::Point& pos,
base::WeakPtr<ElectronMenuModel> menu_model) {
content::GetUIThreadTaskRunner({})->PostTask( content::GetUIThreadTaskRunner({})->PostTask(
FROM_HERE, FROM_HERE, base::BindOnce(&TrayIconCocoa::PopUpOnUI,
base::BindOnce(&TrayIconCocoa::PopUpOnUI, weak_factory_.GetWeakPtr(), weak_factory_.GetWeakPtr(), menu_model));
base::Unretained(menu_model)));
} }
void TrayIconCocoa::CloseContextMenu() { void TrayIconCocoa::CloseContextMenu() {

14
shell/browser/ui/win/notify_icon.cc
View file

@ -86,7 +86,7 @@ void NotifyIcon::HandleClickEvent(int modifiers,
return; return;
} else if (!double_button_click) { // single right click } else if (!double_button_click) { // single right click
if (menu_model_) if (menu_model_)
PopUpContextMenu(gfx::Point(), menu_model_); PopUpContextMenu(gfx::Point(), menu_model_->GetWeakPtr());
else else
NotifyRightClicked(bounds, modifiers); NotifyRightClicked(bounds, modifiers);
} }
@ -191,7 +191,7 @@ void NotifyIcon::Focus() {
} }
void NotifyIcon::PopUpContextMenu(const gfx::Point& pos, void NotifyIcon::PopUpContextMenu(const gfx::Point& pos,
raw_ptr<ElectronMenuModel> menu_model) { base::WeakPtr<ElectronMenuModel> menu_model) {
// Returns if context menu isn't set. // Returns if context menu isn't set.
if (menu_model == nullptr && menu_model_ == nullptr) if (menu_model == nullptr && menu_model_ == nullptr)
return; return;
@ -209,9 +209,13 @@ void NotifyIcon::PopUpContextMenu(const gfx::Point& pos,
if (pos.IsOrigin()) if (pos.IsOrigin())
rect.set_origin(display::Screen::GetScreen()->GetCursorScreenPoint()); rect.set_origin(display::Screen::GetScreen()->GetCursorScreenPoint());
menu_runner_ = std::make_unique<views::MenuRunner>( if (menu_model) {
menu_model != nullptr ? menu_model : menu_model_, menu_runner_ = std::make_unique<views::MenuRunner>(
views::MenuRunner::HAS_MNEMONICS); menu_model.get(), views::MenuRunner::HAS_MNEMONICS);
} else {
menu_runner_ = std::make_unique<views::MenuRunner>(
menu_model_, views::MenuRunner::HAS_MNEMONICS);
}
menu_runner_->RunMenuAt(nullptr, nullptr, rect, menu_runner_->RunMenuAt(nullptr, nullptr, rect,
views::MenuAnchorPosition::kTopLeft, views::MenuAnchorPosition::kTopLeft,
ui::MENU_SOURCE_MOUSE); ui::MENU_SOURCE_MOUSE);

3
shell/browser/ui/win/notify_icon.h
View file

@ -13,6 +13,7 @@
#include <string> #include <string>
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/memory/weak_ptr.h"
#include "base/win/scoped_gdi_object.h" #include "base/win/scoped_gdi_object.h"
#include "shell/browser/ui/tray_icon.h" #include "shell/browser/ui/tray_icon.h"
#include "shell/browser/ui/win/notify_icon_host.h" #include "shell/browser/ui/win/notify_icon_host.h"
@ -65,7 +66,7 @@ class NotifyIcon : public TrayIcon {
void RemoveBalloon() override; void RemoveBalloon() override;
void Focus() override; void Focus() override;
void PopUpContextMenu(const gfx::Point& pos, void PopUpContextMenu(const gfx::Point& pos,
raw_ptr<ElectronMenuModel> menu_model) override; base::WeakPtr<ElectronMenuModel> menu_model) override;
void CloseContextMenu() override; void CloseContextMenu() override;
void SetContextMenu(raw_ptr<ElectronMenuModel> menu_model) override; void SetContextMenu(raw_ptr<ElectronMenuModel> menu_model) override;
gfx::Rect GetBounds() override; gfx::Rect GetBounds() override;