[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 5b12a16bc39e0da7b973ec98765ca9610a0ea649
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 12 18:46:20 2009 +0000

    2009-11-12  Nicolas Weber  <thakis at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Send |keypress()| events for keys with cmd down, like safari.
            Test: Hit cmd-shift-a on unixpapa.com/js/testkey.html , should show a
            keypress() event.
    
            * src/mac/WebInputEventFactory.mm:
            (WebKit::WebInputEventFactory::keyboardEvent):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50887 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index e363e30..0d09f81 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-12  Nicolas Weber  <thakis at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Send |keypress()| events for keys with cmd down, like safari.
+        Test: Hit cmd-shift-a on unixpapa.com/js/testkey.html , should show a
+        keypress() event.
+
+        * src/mac/WebInputEventFactory.mm:
+        (WebKit::WebInputEventFactory::keyboardEvent):
+
 2009-11-11  Jeremy Orlow  <jorlow at chromium.org>
 
         Not reviewed.  Build fix.  Will be cleaned up in subsequent patch once we know exaclty what's going on.
diff --git a/WebKit/chromium/src/mac/WebInputEventFactory.mm b/WebKit/chromium/src/mac/WebInputEventFactory.mm
index d618228..526bf04 100644
--- a/WebKit/chromium/src/mac/WebInputEventFactory.mm
+++ b/WebKit/chromium/src/mac/WebInputEventFactory.mm
@@ -947,13 +947,10 @@ WebKeyboardEvent WebInputEventFactory::keyboardEvent(wchar_t character,
     result.text[0] = character;
     result.unmodifiedText[0] = character;
 
-    // Windows and Linux set |isSystemKey| if alt is down. WebKit looks at this
-    // flag to decide if it should handle a key or not. E.g. alt-left/right
-    // shouldn't be used by WebKit 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.
-    if (result.modifiers & WebInputEvent::MetaKey)
-        result.isSystemKey = true;
+    // Do not set |isSystemKey| in this constructor. This constructor is used
+    // to build key events that eventually become js |keypress()| events, which
+    // do not fire if |isSystemKey| is set. Since we trigger shortcuts after
+    // |keydown()|, it is ok to not set this anyway.
 
     return result;
 }

-- 
WebKit Debian packaging