Changeset 69840 in webkit

Timestamp:

Oct 14, 2010 11:33:46 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-14 Wei Jia <​wjia@chromium.org>

Reviewed by Darin Fisher.

Retrieve info of lock keys from stashed currentInputEvent which
is stored by chromium when it passes input event to WebCore.
Retrieving only when stashed event is a keyboard event, which
means synthetic KeyboardEvent inherits lock key state from real
keyboard event.
​https://bugs.webkit.org/show_bug.cgi?id=46518

• src/WebPluginContainerImpl.cpp: (WebKit::WebPluginContainerImpl::handleKeyboardEvent):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebPluginContainerImpl.cpp (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-10-14  Wei Jia  <wjia@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Retrieve info of lock keys from stashed currentInputEvent which
+        is stored by chromium when it passes input event to WebCore.
+        Retrieving only when stashed event is a keyboard event, which
+        means synthetic KeyboardEvent inherits lock key state from real
+        keyboard event.
+        https://bugs.webkit.org/show_bug.cgi?id=46518
+
+        * src/WebPluginContainerImpl.cpp:
+        (WebKit::WebPluginContainerImpl::handleKeyboardEvent):
+
 2010-10-14  John Abd-El-Malek  <jam@chromium.org>
 

trunk/WebKit/chromium/src/WebPluginContainerImpl.cpp

@@ -469 +469 @@
     }
 
+    const WebInputEvent* currentInputEvent = WebViewImpl::currentInputEvent();
+
+    // Copy stashed info over, and only copy here in order not to interfere
+    // the ctrl-c logic above.
+    if (currentInputEvent
+        && WebInputEvent::isKeyboardEventType(currentInputEvent->type)) {
+        webEvent.modifiers |= currentInputEvent->modifiers &
+            (WebInputEvent::CapsLockOn | WebInputEvent::NumLockOn);
+    }
+
     WebCursorInfo cursorInfo;
     if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))