From e14391e94c850b8bd03680c23b38978db68687a8 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 4 Nov 2010 12:00:17 -0700
Subject: Merge Webkit at r70949: Initial merge by git.

Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
---
 WebKit/chromium/src/mac/WebInputEventFactory.mm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'WebKit/chromium/src/mac')

diff --git a/WebKit/chromium/src/mac/WebInputEventFactory.mm b/WebKit/chromium/src/mac/WebInputEventFactory.mm
index b4e09c0..015409e 100644
--- a/WebKit/chromium/src/mac/WebInputEventFactory.mm
+++ b/WebKit/chromium/src/mac/WebInputEventFactory.mm
@@ -856,6 +856,8 @@ static inline int modifiersFromEvent(NSEvent* event) {
         modifiers |= WebInputEvent::AltKey;
     if ([event modifierFlags] & NSCommandKeyMask)
         modifiers |= WebInputEvent::MetaKey;
+    if ([event modifierFlags] & NSAlphaShiftKeyMask)
+        modifiers |= WebInputEvent::CapsLockOn;
     // TODO(port): Set mouse button states
 
     return modifiers;
-- 
cgit v1.1