Changeset 69134 in webkit

Timestamp:

Oct 5, 2010 12:13:01 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-05 Kimmo Kinnunen <​kimmo.t.kinnunen@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.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/qt/PluginViewQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-05  Kimmo Kinnunen  <kimmo.t.kinnunen@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@google.com>
 

trunk/WebCore/plugins/qt/PluginViewQt.cpp

@@ -386 +386 @@
     // 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());
     }