[OSX] stop nesting loop for menuNeedsUpdate; fix key stroke skipping

rogerwang · rogerwang · commit 72f5808648f3 · 2015-01-01T20:58:50.000+08:00
nesting loop and doneMenuShow() will lost key stokes;
and 'show' event was sent on every key stroke, which is part of hotkey

Conflicts:
	src/api/menu/menu_delegate_mac.mm
	src/nw_version.h
diff --git a/src/api/dispatcher_host.cc b/src/api/dispatcher_host.cc
@@ -108,6 +108,7 @@ bool DispatcherHost::Send(IPC::Message* message) {
 void DispatcherHost::quit_run_loop() {
   if (run_loop_)
     run_loop_->Quit();
+  run_loop_ = NULL;
 }
 
 bool DispatcherHost::OnMessageReceived(
diff --git a/src/api/dispatcher_host.h b/src/api/dispatcher_host.h
@@ -79,6 +79,8 @@ class DispatcherHost : public content::WebContentsObserver {
 
   void set_run_loop(base::RunLoop* run_loop) { run_loop_ = run_loop; }
   void quit_run_loop();
+  base::RunLoop* run_loop() { return run_loop_; }
+
  private:
   content::RenderViewHost* render_view_host_;
   friend class content::Shell;
diff --git a/src/api/menu/menu_delegate_mac.mm b/src/api/menu/menu_delegate_mac.mm
@@ -35,6 +35,15 @@ - (id)initWithMenu:(nwapi::Menu*) menu {
 }
 
 - (void)menuNeedsUpdate:(NSMenu*)menu {
+  if (!nwmenu_->enable_show_event() || nwmenu_->dispatcher_host()->run_loop())
+    return;
+  NSEvent* event = [NSApp currentEvent];
+  // NSLog (@"%@\n", event);
+  // Cocoa will try to populate menu on every keystoke of the key equivlants,
+  // which is slow. The following bypassed it
+  if ([event type] != NSSystemDefined || [event subtype] == 8)
+    return;
+
   base::ListValue args;
   base::RunLoop run_loop;
   nwmenu_->dispatcher_host()->set_run_loop(&run_loop);

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ bool DispatcherHost::Send(IPC::Message* message) {`
`108`	`108`	`void DispatcherHost::quit_run_loop() {`
`109`	`109`	`if (run_loop_)`
`110`	`110`	`run_loop_->Quit();`
	`111`	`+ run_loop_ = NULL;`
`111`	`112`	`}`
`112`	`113`
`113`	`114`	`bool DispatcherHost::OnMessageReceived(`