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

[tonikitoo at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit f386f2991eebaf8a4d583a8d3a43d8d63dcdb768
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 11 18:48:43 2010 +0000

    [Qt] Access key modifier should be Ctrl+Alt for Darwin derived OS and Alt for the others
    https://bugs.webkit.org/show_bug.cgi?id=35993
    
    Patch by Diego Gonzalez <diego.gonzalez at openbossa.org> on 2010-03-11
    Reviewed by Simon Hausmann.
    
    WebCore:
    
    * page/qt/EventHandlerQt.cpp:
    (WebCore::EventHandler::accessKeyModifiers):
    
    LayoutTests:
    
    * platform/qt/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55847 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 60f3752..03d1817 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-11  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Access key modifier should be Ctrl+Alt for Darwin derived OS and Alt for the others
+        https://bugs.webkit.org/show_bug.cgi?id=35993
+
+        * platform/qt/Skipped:
+
 2010-03-11  Chris Fleizach  <cfleizach at apple.com>
 
         Unreviewed.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index b3d5df5..9196673 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -462,12 +462,10 @@ fast/events/standalone-image-drag-to-editable.html
 fast/events/updateLayoutForHitTest.html
 fast/forms/input-list.html
 fast/forms/input-selectedoption.html
-fast/forms/access-key.html
 fast/forms/button-cannot-be-nested.html
 fast/forms/control-restrict-line-height.html
 fast/forms/drag-into-textarea.html
 fast/forms/focus-selection-input.html
-fast/forms/focus-selection-textarea.html
 fast/forms/input-readonly-autoscroll.html
 fast/forms/input-text-click-outside.html
 fast/forms/input-text-double-click.html
@@ -1158,7 +1156,6 @@ fast/dynamic/selection-highlight-adjust.html
 fast/encoding/char-decoding.html
 fast/encoding/frame-default-enc.html
 fast/encoding/invalid-xml.html
-fast/events/access-key-self-destruct.html
 fast/events/attempt-scroll-with-no-scrollbars.html
 fast/events/key-events-in-input-button.html
 fast/forms/input-align-image.html
@@ -1166,7 +1163,6 @@ fast/forms/input-align.html
 fast/forms/input-double-click-selection-gap-bug.html
 fast/forms/input-radio-checked-tab.html
 fast/forms/input-text-option-delete.html
-fast/forms/legend-access-key.html
 fast/forms/textarea-rows-cols.html
 fast/frames/onlyCommentInIFrame.html
 fast/inline/positionedLifetime.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8bb911e..3599015 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-11  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Access key modifier should be Ctrl+Alt for Darwin derived OS and Alt for the others
+        https://bugs.webkit.org/show_bug.cgi?id=35993
+
+        * page/qt/EventHandlerQt.cpp:
+        (WebCore::EventHandler::accessKeyModifiers):
+
 2010-03-08  Brett Wilson  <brettw at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/page/qt/EventHandlerQt.cpp b/WebCore/page/qt/EventHandlerQt.cpp
index 3425289..d7982fa 100644
--- a/WebCore/page/qt/EventHandlerQt.cpp
+++ b/WebCore/page/qt/EventHandlerQt.cpp
@@ -132,7 +132,11 @@ bool EventHandler::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults&
 
 unsigned EventHandler::accessKeyModifiers()
 {
-    return PlatformKeyboardEvent::CtrlKey;
+#if OS(DARWIN)
+    return PlatformKeyboardEvent::CtrlKey | PlatformKeyboardEvent::AltKey;
+#else
+    return PlatformKeyboardEvent::AltKey;
+#endif
 }
 
 }

-- 
WebKit Debian packaging