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

[dimich at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit ce71252f378797aaa8b7638ed861b77471731485
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 18 00:24:16 2009 +0000

    Revert r50887, it regressed handling of cmd-left when a text box is focused.
    https://bugs.webkit.org/show_bug.cgi?id=31566
    
    Patch by Nicolas Weber <thakis at chromium.org> on 2009-11-17
    Reviewed by Darin Fisher, Dmitry Titov.
    
    * src/mac/WebInputEventFactory.mm:
    (WebKit::WebInputEventFactory::keyboardEvent):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51095 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 46a17f8..97655b6 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-17  Nicolas Weber  <thakis at chromium.org>
+
+        Reviewed by Darin Fisher, Dmitry Titov.
+
+        Revert r50887, it regressed handling of cmd-left when a text box is focused.
+        https://bugs.webkit.org/show_bug.cgi?id=31566
+
+        * src/mac/WebInputEventFactory.mm:
+        (WebKit::WebInputEventFactory::keyboardEvent):
+
 2009-11-16  Kenneth Russell  <kbr at google.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKit/chromium/src/mac/WebInputEventFactory.mm b/WebKit/chromium/src/mac/WebInputEventFactory.mm
index 526bf04..d618228 100644
--- a/WebKit/chromium/src/mac/WebInputEventFactory.mm
+++ b/WebKit/chromium/src/mac/WebInputEventFactory.mm
@@ -947,10 +947,13 @@ WebKeyboardEvent WebInputEventFactory::keyboardEvent(wchar_t character,
     result.text[0] = character;
     result.unmodifiedText[0] = character;
 
-    // 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.
+    // 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;
 
     return result;
 }

-- 
WebKit Debian packaging