[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a28d1b1eee726362709003052c8a125d7d53990e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 21:38:41 2010 +0000

    2010-10-27  Stuart Morgan  <stuartmorgan at chromium.org>
    
            Reviewed by David Levin.
    
            Include caps lock state when converting NSEvent modifiers to
            WebInputEvent
    
            https://bugs.webkit.org/show_bug.cgi?id=47917
    
            * src/mac/WebInputEventFactory.mm:
            (WebKit::modifiersFromEvent):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70713 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 117dbf6..783815a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-27  Stuart Morgan  <stuartmorgan at chromium.org>
+
+        Reviewed by David Levin.
+
+        Include caps lock state when converting NSEvent modifiers to
+        WebInputEvent
+
+        https://bugs.webkit.org/show_bug.cgi?id=47917
+
+        * src/mac/WebInputEventFactory.mm:
+        (WebKit::modifiersFromEvent):
+
 2010-10-27  Chris Rogers  <crogers at google.com>
 
         Reviewed by James Robinson.
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;

-- 
WebKit Debian packaging