Wrap -[BrowserCrApplication nextEventMatchingMask:…] with base::mac::CallWithEHFrame.

chrome/browser/chrome_browser_application_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/chrome_browser_application_mac.h"
 
 #include <objc/objc-exception.h>
 
 #import "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 248 matching lines @@
   AppController* appController = static_cast<AppController*>([NSApp delegate]);
   [appController tryToTerminateApplication:self];
   // Return, don't exit. The application is responsible for exiting on its own.
 }
 
 - (void)cancelTerminate:(id)sender {
   AppController* appController = static_cast<AppController*>([NSApp delegate]);
   [appController stopTryingToTerminateApplication:self];
 }
 
+// The event |mask| has historically been declared as an NSUInteger
+// (unsigned long). Starting in the 10.12 SDK, the mask type changed to
+// NSEventMask (unsigned long long) if __LP64__ and NSUInteger otherwise.
+// These types are incompatible, which creates an issue for suppporting
+// both 10.10/10.11 and 10.12 SDKs. Work around it using the #if below.
+- (NSEvent*)nextEventMatchingMask:
+#if !defined(MAC_OS_X_VERSION_10_12) || \

[Mark Mentovai, 2016/10/19 23:01:39]

#include <AvailabilityMacros.h>

[Robert Sesek, 2016/10/19 23:22:12]

Done.

+    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12

[Mark Mentovai, 2016/10/19 23:01:39]

Match what the SDK does by working __LP64__ into the mix, in case that ever
becomes something relevant again. Because the way things have been going, maybe
it will.

[Robert Sesek, 2016/10/19 23:22:12]

That would be exciting. Done.

+                                  (NSUInteger)mask
+#else
+                                  (NSEventMask)mask
+#endif
+                        untilDate:(NSDate*)expiration
+                           inMode:(NSString*)mode
+                          dequeue:(BOOL)dequeue {
+  __block NSEvent* event = nil;
+  base::mac::CallWithEHFrame(^{
+      event = [super nextEventMatchingMask:mask
+                                 untilDate:expiration
+                                    inMode:mode
+                                   dequeue:dequeue];
+  });
+  return event;
+}
+
 - (BOOL)sendAction:(SEL)anAction to:(id)aTarget from:(id)sender {
   // The Dock menu contains an automagic section where you can select
   // amongst open windows.  If a window is closed via JavaScript while
   // the menu is up, the menu item for that window continues to exist.
   // When a window is selected this method is called with the
   // now-freed window as |aTarget|.  Short-circuit the call if
   // |aTarget| is not a valid window.
   if (anAction == @selector(_selectWindow:)) {
     // Not using -[NSArray containsObject:] because |aTarget| may be a
     // freed object.
@@ skipping 83 matching lines @@
 - (void)_cycleWindowsReversed:(BOOL)arg1 {
   base::AutoReset<BOOL> pin(&cyclingWindows_, YES);
   [super _cycleWindowsReversed:arg1];
 }
 
 - (BOOL)isCyclingWindows {
   return cyclingWindows_;
 }
 
 @end