Unify all event modifier handling to a common place (and make it correct!).

third_party/WebKit/WebKit/chromium/src/mac/WebInputEventFactory.mm

 /*
  * 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
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 807 matching lines @@
         // FIXME: We should use something other than the vendor-area Unicode values for the above keys.
         // For now, just fall through to the default.
     default:
         return [NSString stringWithFormat:@"U+%04X", WTF::toASCIIUpper(c)];
     }
 }
 
 // End Apple code.
 // ----------------------------------------------------------------------------
 
+static inline int modifiersFromEvent(NSEvent* event) {
+    int modifiers = 0;
+
+    if ([event modifierFlags] & NSControlKeyMask)
+        modifiers |= WebInputEvent::ControlKey;
+    if ([event modifierFlags] & NSShiftKeyMask)
+        modifiers |= WebInputEvent::ShiftKey;
+    if ([event modifierFlags] & NSAlternateKeyMask)
+        modifiers |= WebInputEvent::AltKey;
+    if ([event modifierFlags] & NSCommandKeyMask)
+        modifiers |= WebInputEvent::MetaKey;
+
+    return modifiers;
+}
+
 WebKeyboardEvent WebInputEventFactory::keyboardEvent(NSEvent* event)
 {
     WebKeyboardEvent result;
 
     result.type =
         isKeyUpEvent(event) ? WebInputEvent::KeyUp : WebInputEvent::KeyDown;
 
-    if ([event modifierFlags] & NSControlKeyMask)
-        result.modifiers |= WebInputEvent::ControlKey;
-    if ([event modifierFlags] & NSShiftKeyMask)
-        result.modifiers |= WebInputEvent::ShiftKey;
-    if ([event modifierFlags] & NSAlternateKeyMask)
-        result.modifiers |= WebInputEvent::AltKey;
-    if ([event modifierFlags] & NSCommandKeyMask)
-        result.modifiers |= WebInputEvent::MetaKey;
+    result.modifiers = modifiersFromEvent(event);
 
     if (isKeypadEvent(event))
         result.modifiers |= WebInputEvent::IsKeyPad;
 
     if (([event type] != NSFlagsChanged) && [event isARepeat])
         result.modifiers |= WebInputEvent::IsAutoRepeat;
 
     result.windowsKeyCode = windowsKeyCodeForKeyEvent(event);
     result.nativeKeyCode = [event keyCode];
 
@@ skipping 92 matching lines @@
         result.button = WebMouseEvent::ButtonMiddle;
         break;
     case NSRightMouseDragged:
         result.type = WebInputEvent::MouseMove;
         result.button = WebMouseEvent::ButtonRight;
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 
-    // set position fields:
     NSPoint location = [NSEvent mouseLocation];  // global coordinates
     result.globalX = location.x;
     result.globalY = location.y;
 
     NSPoint windowLocal = [event locationInWindow];
     location = [view convertPoint:windowLocal fromView:nil];
     result.y = [view frame].size.height - location.y;  // flip y
     result.x = location.x;
 
-    // set modifiers:
-
-    if ([event modifierFlags] & NSControlKeyMask)
-        result.modifiers |= WebInputEvent::ControlKey;
-    if ([event modifierFlags] & NSShiftKeyMask)
-        result.modifiers |= WebInputEvent::ShiftKey;
-    if ([event modifierFlags] & NSAlternateKeyMask)
-        result.modifiers |= (WebInputEvent::AltKey | WebInputEvent::MetaKey);  // FIXME: set MetaKey properly
+    result.modifiers = modifiersFromEvent(event);
 
     result.timeStampSeconds = [event timestamp];
 
     return result;
 }
 
 // WebMouseWheelEvent ---------------------------------------------------------
 
 WebMouseWheelEvent WebInputEventFactory::mouseWheelEvent(NSEvent* event, NSView* view)
 {
     WebMouseWheelEvent result;
 
     result.type = WebInputEvent::MouseWheel;
     result.button = WebMouseEvent::ButtonNone;
 
-    // Set modifiers based on key state.
-    if ([event modifierFlags] & NSControlKeyMask)
-        result.modifiers |= WebInputEvent::ControlKey;
-    if ([event modifierFlags] & NSShiftKeyMask)
-        result.modifiers |= WebInputEvent::ShiftKey;
-    if ([event modifierFlags] & NSAlternateKeyMask)
-        result.modifiers |= WebInputEvent::AltKey;
+    result.modifiers = modifiersFromEvent(event);
 
     // Set coordinates by translating event coordinates from screen to client.
     NSPoint location = [NSEvent mouseLocation];  // global coordinates
     result.globalX = location.x;
     result.globalY = location.y;
     NSPoint windowLocal = [event locationInWindow];
     location = [view convertPoint:windowLocal fromView:nil];
     result.x = location.x;
     result.y = [view frame].size.height - location.y;  // flip y
 
@@ skipping 121 matching lines @@
         static const double scrollbarPixelsPerCocoaTick = 40.0;
 
         result.deltaX = [event deltaX] * scrollbarPixelsPerCocoaTick;
         result.deltaY = [event deltaY] * scrollbarPixelsPerCocoaTick;
     }
 
     return result;
 }
 
 } // namespace WebKit