Changeset 86798 in webkit

Timestamp:

May 18, 2011 3:10:55 PM (13 years ago)

Author:

yi.4.shen@nokia.com

Message:

2011-05-18 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Andreas Kling.

[Qt] Enterkey to go to Newline does not work in the text area(in HTML form)
​https://bugs.webkit.org/show_bug.cgi?id=33179

Unskip the fast/events/onsearch-enter.html test.

• platform/qt/Skipped:

2011-05-18 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Andreas Kling.

[Qt] Enterkey to go to Newline does not work in the text area(in HTML form)
​https://bugs.webkit.org/show_bug.cgi?id=33179

Fill the missing key text for the EnterKey event.

Tests: fast/events/onsearch-enter.html

• platform/qt/PlatformKeyboardEventQt.cpp: (WebCore::keyTextForKeyEvent):

2011-05-18 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Andreas Kling.

[Qt] Enterkey to go to Newline does not work in the text area(in HTML form)
​https://bugs.webkit.org/show_bug.cgi?id=33179

Remove the implementation of the handleInputMethodKeydown, which introduces
a regression(r82243) on Linux. Also, add more Api tests for the EnterKey event.

• WebCoreSupport/EditorClientQt.cpp: (WebCore::EditorClientQt::handleInputMethodKeydown): Remove implementation.
• tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods): Add more tests.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/qt/PlatformKeyboardEventQt.cpp (modified) (1 diff)
• Source/WebKit/qt/ChangeLog (modified) (1 diff)
• Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp (modified) (1 diff)
• Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-18  Yi Shen  <yi.4.shen@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Enterkey to go to Newline does not work in the text area(in HTML form)
+        https://bugs.webkit.org/show_bug.cgi?id=33179
+
+        Unskip the fast/events/onsearch-enter.html test.
+
+        * platform/qt/Skipped:
+
 2011-05-18  Rob Buis  <rbuis@rim.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -2250 +2250 @@
 http/tests/inspector/network/network-size-sync.html
 
-# [Qt]REGRESSION(r82243): fast/events/onsearch-enter.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=57472
-fast/events/onsearch-enter.html
-
 # [Qt] media/video-playbackrate.html fails
 # https://bugs.webkit.org/show_bug.cgi?id=57476

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-18  Yi Shen  <yi.4.shen@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Enterkey to go to Newline does not work in the text area(in HTML form)
+        https://bugs.webkit.org/show_bug.cgi?id=33179
+
+        Fill the missing key text for the EnterKey event.
+
+        Tests: fast/events/onsearch-enter.html
+
+        * platform/qt/PlatformKeyboardEventQt.cpp:
+        (WebCore::keyTextForKeyEvent):
+
 2011-05-17  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebCore/platform/qt/PlatformKeyboardEventQt.cpp

@@ -586 +586 @@
         if (event->text().isNull())
             return "\t";
+        break;
+    case Qt::Key_Enter:
+        if (event->text().isNull())
+            return "\r";
     }
     return event->text();

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-05-18  Yi Shen  <yi.4.shen@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Enterkey to go to Newline does not work in the text area(in HTML form)
+        https://bugs.webkit.org/show_bug.cgi?id=33179
+
+        Remove the implementation of the handleInputMethodKeydown, which introduces
+        a regression(r82243) on Linux. Also, add more Api tests for the EnterKey event.
+
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::handleInputMethodKeydown): Remove implementation.
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods): Add more tests.
+
 2011-05-18  Kristóf Kosztyó  <Kosztyo.Kristof@stud.u-szeged.hu>
 

trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp

@@ -532 +532 @@
 }
 
-void EditorClientQt::handleInputMethodKeydown(KeyboardEvent* event)
-{
-#ifndef QT_NO_SHORTCUT
-    const PlatformKeyboardEvent* kevent = event->keyEvent();
-    if (kevent->type() == PlatformKeyboardEvent::RawKeyDown) {
-        QWebPage::WebAction action = QWebPagePrivate::editorActionForKeyEvent(kevent->qtEvent());
-        switch (action) {
-        case QWebPage::InsertParagraphSeparator:
-        case QWebPage::InsertLineSeparator:
-            m_page->triggerAction(action);
-            break;
-        default:
-            break;
-        }
-    }
-#endif
+void EditorClientQt::handleInputMethodKeydown(KeyboardEvent*)
+{
 }
 

trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@ -2151 +2151 @@
                                             "</body></html>");
     page->mainFrame()->evaluateJavaScript("var inputEle = document.getElementById('input5'); inputEle.focus(); inputEle.select();");
+    
+    // Enter Key without key text
     QKeyEvent keyEnter(QEvent::KeyPress, Qt::Key_Enter, Qt::NoModifier);
     page->event(&keyEnter);
     QList<QInputMethodEvent::Attribute> attribs;
 
-    QInputMethodEvent eventText("\n", attribs);
+    QInputMethodEvent eventText(QString(), attribs);
+    eventText.setCommitString("\n");
     page->event(&eventText);
 
-    QInputMethodEvent eventText2("third line", attribs);
+    QInputMethodEvent eventText2(QString(), attribs);
+    eventText2.setCommitString("third line");
     page->event(&eventText2);
     qApp->processEvents();
@@ -2164 +2168 @@
     QString inputValue2 = page->mainFrame()->evaluateJavaScript("document.getElementById('input5').value").toString();
     QCOMPARE(inputValue2, QString("\n\nthird line"));
+
+    // Enter Key with key text '\r'
+    page->mainFrame()->evaluateJavaScript("var inputEle = document.getElementById('input5'); inputEle.value = ''; inputEle.focus(); inputEle.select();");
+    inputValue2 = page->mainFrame()->evaluateJavaScript("document.getElementById('input5').value").toString();
+    QCOMPARE(inputValue2, QString(""));
+
+    QKeyEvent keyEnterWithCarriageReturn(QEvent::KeyPress, Qt::Key_Enter, Qt::NoModifier, "\r");
+    page->event(&keyEnterWithCarriageReturn);
+    page->event(&eventText);
+    page->event(&eventText2);
+    qApp->processEvents();
+
+    inputValue2 = page->mainFrame()->evaluateJavaScript("document.getElementById('input5').value").toString();
+    QCOMPARE(inputValue2, QString("\n\nthird line"));
+
+    // Enter Key with key text '\n'
+    page->mainFrame()->evaluateJavaScript("var inputEle = document.getElementById('input5'); inputEle.value = ''; inputEle.focus(); inputEle.select();");
+    inputValue2 = page->mainFrame()->evaluateJavaScript("document.getElementById('input5').value").toString();
+    QCOMPARE(inputValue2, QString(""));
+
+    QKeyEvent keyEnterWithLineFeed(QEvent::KeyPress, Qt::Key_Enter, Qt::NoModifier, "\n");
+    page->event(&keyEnterWithLineFeed);
+    page->event(&eventText);
+    page->event(&eventText2);
+    qApp->processEvents();
+
+    inputValue2 = page->mainFrame()->evaluateJavaScript("document.getElementById('input5').value").toString();
+    QCOMPARE(inputValue2, QString("\n\nthird line"));
+
+    // Enter Key with key text "\n\r"
+    page->mainFrame()->evaluateJavaScript("var inputEle = document.getElementById('input5'); inputEle.value = ''; inputEle.focus(); inputEle.select();");
+    inputValue2 = page->mainFrame()->evaluateJavaScript("document.getElementById('input5').value").toString();
+    QCOMPARE(inputValue2, QString(""));
+
+    QKeyEvent keyEnterWithLFCR(QEvent::KeyPress, Qt::Key_Enter, Qt::NoModifier, "\n\r");
+    page->event(&keyEnterWithLFCR);
+    page->event(&eventText);
+    page->event(&eventText2);
+    qApp->processEvents();
+
+    inputValue2 = page->mainFrame()->evaluateJavaScript("document.getElementById('input5').value").toString();
+    QCOMPARE(inputValue2, QString("\n\nthird line"));
+
     // END - Newline test for textarea