Changeset 39239 in webkit

Timestamp:

Dec 12, 2008, 5:49:40 AM (16 years ago)

Author:

Simon Hausmann

Message:

2008-12-12 Simon Hausmann <Simon Hausmann>

Reviewed by Tor Arne Vestbø.

Fix pressing return/enter not triggering any action on web sites
that define event handlers, such as the JS console in the web
inspector.

Process the key events in the DOM first and if not handled map them
to editor actions.

Location:

trunk/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (2 diffs)
• Api/qwebpage_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/EditorClientQt.cpp (modified) (4 diffs)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -619 +619 @@
 
 #ifndef QT_NO_SHORTCUT
-static QWebPage::WebAction editorActionForKeyEvent(QKeyEvent* event)
+QWebPage::WebAction QWebPagePrivate::editorActionForKeyEvent(QKeyEvent* event)
 {
     static struct {
@@ -676 +676 @@
     WebCore::Frame* frame = page->focusController()->focusedOrMainFrame();
     WebCore::Editor* editor = frame->editor();
-#ifndef QT_NO_SHORTCUT
-    if (editor->canEdit()) {
-        QWebPage::WebAction action = editorActionForKeyEvent(ev);
-        if (action != QWebPage::NoWebAction) {
-            q->triggerAction(action);
-            handled = true;
-        }
-    } else {
-        if (ev == QKeySequence::Copy) {
-            q->triggerAction(QWebPage::Copy);
-            handled = true;
-        }
-    }
-#endif // QT_NO_SHORTCUT
+    // we forward the key event to WebCore first to handle potential DOM
+    // defined event handlers and later on end up in EditorClientQt::handleKeyboardEvent
+    // to trigger editor commands via triggerAction().
     if (!handled)
         handled = frame->eventHandler()->keyEvent(ev);

trunk/WebKit/qt/Api/qwebpage_p.h

@@ -113 +113 @@
     bool handleScrolling(QKeyEvent*);
 
+#ifndef QT_NO_SHORTCUT
+    static QWebPage::WebAction editorActionForKeyEvent(QKeyEvent* event);
+#endif
+
     WebCore::ChromeClientQt *chromeClient;
     WebCore::ContextMenuClientQt *contextMenuClient;

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2008-12-12  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Fix pressing return/enter not triggering any action on web sites
+        that define event handlers, such as the JS console in the web
+        inspector.
+
+        Process the key events in the DOM first and if not handled map them
+        to editor actions.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::editorActionForKeyEvent): Made a class method.
+        (QWebPagePrivate::keyPressEvent): Pass the key event first to the DOM.
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::handleKeyboardEvent): Map the key event to
+        actions and trigger them.
+
 2008-12-12  Ariya Hidayat  <ariya.hidayat@trolltech.com>
 

trunk/WebKit/qt/WebCoreSupport/EditorClientQt.cpp

@@ -366 +366 @@
     // FIXME: refactor all of this to use Actions or something like them
     if (start->isContentEditable()) {
+#ifndef QT_NO_SHORTCUT
+        QWebPage::WebAction action = QWebPagePrivate::editorActionForKeyEvent(kevent->qtEvent());
+        if (action != QWebPage::NoWebAction) {
+            m_page->triggerAction(action);
+        } else
+#endif // QT_NO_SHORTCUT
         switch (kevent->windowsVirtualKeyCode()) {
 #if QT_VERSION < 0x040500
@@ -431 +437 @@
                             frame->editor()->command("ToggleBold").execute();
                             break;
-                        case VK_C:
-                            frame->editor()->command("Copy").execute();
-                            break;
                         case VK_I:
                             frame->editor()->command("ToggleItalic").execute();
-                            break;
-                        case VK_V:
-                            frame->editor()->command("Paste").execute();
-                            break;
-                        case VK_X:
-                            frame->editor()->command("Cut").execute();
-                            break;
-                        case VK_Y:
-                            frame->editor()->command("Redo").execute();
-                            break;
-                        case VK_Z:
-                            frame->editor()->command("Undo").execute();
                             break;
                         default:
@@ -460 +451 @@
         }
     } else {
+#ifndef QT_NO_SHORTCUT
+        if (kevent->qtEvent() == QKeySequence::Copy) {
+            m_page->triggerAction(QWebPage::Copy);
+        } else
+#endif // QT_NO_SHORTCUT
         switch (kevent->windowsVirtualKeyCode()) {
             case VK_UP:
@@ -487 +483 @@
                             frame->editor()->command("SelectAll").execute();
                             break;
-                        case VK_C: case VK_X:
-                            frame->editor()->command("Copy").execute();
-                            break;
                         default:
                             return;