Fix false negatives in system key events recognition

content/browser/renderer_host/input/web_input_event_builders_mac.mm

 // Copyright 2015 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.
 
 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006-2009 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 508 matching lines @@
   result->movementX = [event deltaX];
   result->movementY = [event deltaY];
 }
 
 bool IsSystemKeyEvent(const blink::WebKeyboardEvent& event) {
   // Windows and Linux set |isSystemKey| if alt is down. Blink looks at this
   // flag to decide if it should handle a key or not. E.g. alt-left/right
   // shouldn't be used by Blink to scroll the current page, because we want
   // to get that key back for it to do history navigation. Hence, the
   // corresponding situation on OS X is to set this for cmd key presses.
+
   // cmd-b and and cmd-i are system wide key bindings that OS X doesn't
   // handle for us, so the editor handles them.
-  return event.modifiers & blink::WebInputEvent::MetaKey &&
-         event.windowsKeyCode != ui::VKEY_B &&
-         event.windowsKeyCode != ui::VKEY_I;
+  int modifiers = event.modifiers & blink::WebInputEvent::InputModifiers;
+  if (modifiers == blink::WebInputEvent::MetaKey &&
+      event.windowsKeyCode == ui::VKEY_B)
+    return false;
+  if (modifiers == blink::WebInputEvent::MetaKey &&
+      event.windowsKeyCode == ui::VKEY_I)
+    return false;
+
+  return event.modifiers & blink::WebInputEvent::MetaKey;
 }
 
 blink::WebMouseWheelEvent::Phase PhaseForNSEventPhase(
     NSEventPhase event_phase) {
   uint32_t phase = blink::WebMouseWheelEvent::PhaseNone;
   if (event_phase & NSEventPhaseBegan)
     phase |= blink::WebMouseWheelEvent::PhaseBegan;
   if (event_phase & NSEventPhaseStationary)
     phase |= blink::WebMouseWheelEvent::PhaseStationary;
   if (event_phase & NSEventPhaseChanged)
@@ skipping 367 matching lines @@
       break;
     default:
       NOTIMPLEMENTED();
       result.type = blink::WebInputEvent::Undefined;
   }
 
   return result;
 }
 
 }  // namespace content