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

browser: fix crash when switching to sibling menu from submenus

Browse source
This commit is contained in:
Robo 2016-01-20 08:29:44 +05:30
parent 7842a657d0
commit 65325dc63f
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
atom/browser/ui/views/menu_delegate.cc
View file

@ -105,24 +105,17 @@ views::MenuItemView* MenuDelegate::GetSiblingMenu(
ui::MenuModel* model;
if (menu_bar_->GetMenuButtonFromScreenPoint(screen_point, &model, &button) &&
button->tag() != id_) {
// Switch to sibling menu on next tick, otherwise crash may happen.
DCHECK(menu_runner_->IsRunning());
menu_runner_->Cancel();
// After canceling the menu, we need to wait until next tick
// so we are out of nested message loop.
content::BrowserThread::PostTask(
content::BrowserThread::UI, FROM_HERE,
base::Bind(&MenuDelegate::SwitchToSiblingMenu,
base::Unretained(this), button));
base::Bind(base::IgnoreResult(&views::MenuButton::Activate),
base::Unretained(button)));
}
return nullptr;
}
void MenuDelegate::SwitchToSiblingMenu(views::MenuButton* button) {
menu_runner_->Cancel();
// After canceling the menu, we need to wait until next tick so we are out of
// nested message loop.
content::BrowserThread::PostTask(
content::BrowserThread::UI, FROM_HERE,
base::Bind(base::IgnoreResult(&views::MenuButton::Activate),
base::Unretained(button)));
}
} // namespace atom

3
atom/browser/ui/views/menu_delegate.h
View file

@ -50,9 +50,6 @@ class MenuDelegate : public views::MenuDelegate {
views::MenuButton** button) override;
private:
// Close this menu and run the menu of |button|.
void SwitchToSiblingMenu(views::MenuButton* button);
MenuBar* menu_bar_;
int id_;
scoped_ptr<views::MenuDelegate> adapter_;