[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 058a6b425490c3cbf88242edece090e50f7d9483
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 15 06:33:46 2010 +0000

    2010-10-14  Wei Jia  <wjia at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69840 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 06b208b..587025d 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-14  Wei Jia  <wjia at 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 at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKit/chromium/src/WebPluginContainerImpl.cpp b/WebKit/chromium/src/WebPluginContainerImpl.cpp
index 1458a4a..58deecc 100644
--- a/WebKit/chromium/src/WebPluginContainerImpl.cpp
+++ b/WebKit/chromium/src/WebPluginContainerImpl.cpp
@@ -468,6 +468,16 @@ void WebPluginContainerImpl::handleKeyboardEvent(KeyboardEvent* event)
         }
     }
 
+    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))
         event->setDefaultHandled();

-- 
WebKit Debian packaging