[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 26a51f9a8ff1d2aeee862ad00d802165bb5940f8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 19:13:01 2010 +0000

    2010-10-05  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Web process crash when pressing modifiers in input field
            https://bugs.webkit.org/show_bug.cgi?id=44935
    
            Revert part of the http://trac.webkit.org/changeset/69105 due to a
            test regression.  Unix: Add ASSERTs to plugin related code. These
            will fail if Qt WebKit2 is used with plugins, unless code is not
            fixed before.
    
            * plugins/qt/PluginViewQt.cpp:
            (WebCore::setXKeyEventSpecificFields): Use qKeyEvent, Use ASSERT as a reminder.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69134 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d540719..e71c92b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-05  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Web process crash when pressing modifiers in input field
+        https://bugs.webkit.org/show_bug.cgi?id=44935
+
+        Revert part of the http://trac.webkit.org/changeset/69105 due to a
+        test regression.  Unix: Add ASSERTs to plugin related code. These
+        will fail if Qt WebKit2 is used with plugins, unless code is not
+        fixed before.
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::setXKeyEventSpecificFields): Use qKeyEvent, Use ASSERT as a reminder.
+
 2010-10-05  Chris Rogers  <crogers at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp
index 1256fa4..55344c9 100644
--- a/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/WebCore/plugins/qt/PluginViewQt.cpp
@@ -385,13 +385,12 @@ void setXKeyEventSpecificFields(XEvent* xEvent, KeyboardEvent* event)
     // case just populate the XEvent's keycode with the Qt platform-independent keycode. The only
     // place this keycode will be used is in webkit_test_plugin_handle_event().
     if (QWebPagePrivate::drtRun && !xEvent->xkey.keycode) {
-        if (!keyEvent->text().isEmpty())
-            xEvent->xkey.keycode = int(QString(keyEvent->text()).at(0).unicode() + keyEvent->nativeModifiers());
-        else {
-            QKeyEvent* qKeyEvent = keyEvent->qtEvent();
-            if (qKeyEvent && qKeyEvent->key() && (qKeyEvent->key() != Qt::Key_unknown))
-                xEvent->xkey.keycode = int(qKeyEvent->key() + qKeyEvent->modifiers());
-        }
+        QKeyEvent* qKeyEvent = keyEvent->qtEvent();
+        ASSERT(qKeyEvent);
+        if (!qKeyEvent->text().isEmpty())
+            xEvent->xkey.keycode = int(qKeyEvent->text().at(0).unicode() + qKeyEvent->modifiers());
+        else if (qKeyEvent->key() && (qKeyEvent->key() != Qt::Key_unknown))
+            xEvent->xkey.keycode = int(qKeyEvent->key() + qKeyEvent->modifiers());
     }
 
     xEvent->xkey.same_screen = true;

-- 
WebKit Debian packaging