Changeset 83295 in webkit

Timestamp:

Apr 8, 2011 8:24:07 AM (13 years ago)

Author:

yi.4.shen@nokia.com

Message:

2011-04-08 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Antonio Gomes.

[Qt]REGRESSION(r82243): fast/events/onsearch-enter.html fails
​https://bugs.webkit.org/show_bug.cgi?id=57472

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

• platform/qt/Skipped:

2011-04-08 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Antonio Gomes.

[Qt]REGRESSION(r82243): fast/events/onsearch-enter.html fails
​https://bugs.webkit.org/show_bug.cgi?id=57472

Avoid to insert new line for both keydown event & keypress event.

• WebCoreSupport/EditorClientQt.cpp: (WebCore::EditorClientQt::handleInputMethodKeydown):

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-08  Yi Shen  <yi.4.shen@nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt]REGRESSION(r82243): fast/events/onsearch-enter.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=57472
+
+        Unskips the fast/events/onsearch-enter.html test.
+
+        * platform/qt/Skipped:
+
 2011-04-07  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -3235 +3235 @@
 http/tests/uri/username-with-no-hostname.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/WebKit/qt/ChangeLog

@@ +1 @@
+2011-04-08  Yi Shen  <yi.4.shen@nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt]REGRESSION(r82243): fast/events/onsearch-enter.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=57472
+
+        Avoid to insert new line for both keydown event & keypress event.
+
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::handleInputMethodKeydown):
+
 2011-04-07  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

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

@@ -535 +535 @@
 #ifndef QT_NO_SHORTCUT
     const PlatformKeyboardEvent* kevent = event->keyEvent();
-    if (kevent->type() == PlatformKeyboardEvent::RawKeyDown) {
+    if (kevent->type() == PlatformKeyboardEvent::RawKeyDown && !event->defaultPrevented()) {
         QWebPage::WebAction action = QWebPagePrivate::editorActionForKeyEvent(kevent->qtEvent());
         switch (action) {
@@ -541 +541 @@
         case QWebPage::InsertLineSeparator:
             m_page->triggerAction(action);
+            event->setDefaultHandled();
             break;
         default: