Changeset 51832 in webkit

Timestamp:

Dec 7, 2009 8:55:46 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-07 Zhe Su <​suzhe@chromium.org>

Reviewed by Darin Fisher.

[Chromium] accesskey is not supported on Chromium Mac.
​https://bugs.webkit.org/show_bug.cgi?id=32213

This change fixes (partially) the accesskey issue by decoupling the
code for handling accesskeys and system keys. Because on Mac,
the modifiers of accesskeys are ctrl+alt, which are not marked as
system keys.
In order to fully fix this issue, some changes in Chromium code is
also required.

• src/WebViewImpl.cpp: (WebKit::WebViewImpl::keyEvent): (WebKit::WebViewImpl::charEvent):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (3 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2009-12-07  Zhe Su  <suzhe@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] accesskey is not supported on Chromium Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=32213
+
+        This change fixes (partially) the accesskey issue by decoupling the
+        code for handling accesskeys and system keys. Because on Mac,
+        the modifiers of accesskeys are ctrl+alt, which are not marked as
+        system keys.
+        In order to fully fix this issue, some changes in Chromium code is
+        also required.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::keyEvent):
+        (WebKit::WebViewImpl::charEvent):
+
 2009-12-07  Evan Martin  <evan@chromium.org>
 

trunk/WebKit/chromium/src/WebViewImpl.cpp

@@ -465 +465 @@
 
     if (handler->keyEvent(evt)) {
-        if (WebInputEvent::RawKeyDown == event.type && !evt.isSystemKey())
+        if (WebInputEvent::RawKeyDown == event.type)
             m_suppressNextKeypressEvent = true;
         return true;
@@ -530 +530 @@
     // keyPress(char) event and a keyUp event. We reset this flag here as it
     // only applies to the current keyPress event.
-    if (m_suppressNextKeypressEvent) {
-        m_suppressNextKeypressEvent = false;
-        return true;
-    }
+    bool suppress = m_suppressNextKeypressEvent;
+    m_suppressNextKeypressEvent = false;
 
     Frame* frame = focusedWebCoreFrame();
     if (!frame)
-        return false;
+        return suppress;
 
     EventHandler* handler = frame->eventHandler();
     if (!handler)
-        return keyEventDefault(event);
+        return suppress || keyEventDefault(event);
 
     PlatformKeyboardEventBuilder evt(event);
     if (!evt.isCharacterKey())
+        return true;
+
+    // Accesskeys are triggered by char events and can't be suppressed.
+    if (handler->handleAccessKey(evt))
         return true;
 
@@ -552 +554 @@
     // events.
     if (evt.isSystemKey())
-        return handler->handleAccessKey(evt);
-
-    if (!handler->keyEvent(evt))
+        return false;
+
+    if (!suppress && !handler->keyEvent(evt))
         return keyEventDefault(event);