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

rogerwang · rogerwang · commit 7488790a9d90 · 2014-05-21T14:25:03.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
diff --git a/src/api/dispatcher_host.cc b/src/api/dispatcher_host.cc
@@ -102,6 +102,7 @@ bool DispatcherHost::Send(IPC::Message* message) {
 void DispatcherHost::quit_run_loop() {
   if (run_loop_)
     run_loop_->Quit();
+  run_loop_ = NULL;
 }
 
 bool DispatcherHost::OnMessageReceived(const IPC::Message& message) {
diff --git a/src/api/dispatcher_host.h b/src/api/dispatcher_host.h
@@ -78,6 +78,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,7 +35,13 @@ - (id)initWithMenu:(nwapi::Menu*) menu {
 }
 
 - (void)menuNeedsUpdate:(NSMenu*)menu {
-  if (!nwmenu_->enable_show_event())
+  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;
diff --git a/src/nw_version.h b/src/nw_version.h
@@ -38,7 +38,7 @@
 #else
 # define NW_VERSION_STRING  NW_STRINGIFY(NW_MAJOR_VERSION) "." \
                               NW_STRINGIFY(NW_MINOR_VERSION) "." \
-                              NW_STRINGIFY(NW_PATCH_VERSION) "-pre2"
+                              NW_STRINGIFY(NW_PATCH_VERSION) "-pre6"
 #endif
 
 #define NW_VERSION "v" NW_VERSION_STRING

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ bool DispatcherHost::Send(IPC::Message* message) {`
`102`	`102`	`void DispatcherHost::quit_run_loop() {`
`103`	`103`	`if (run_loop_)`
`104`	`104`	`run_loop_->Quit();`
	`105`	`+ run_loop_ = NULL;`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`bool DispatcherHost::OnMessageReceived(const IPC::Message& message) {`