Changeset 148195 in webkit

Timestamp:

Apr 11, 2013 4:46:18 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt] EventHandler should handle Space and BackSpace
​https://bugs.webkit.org/show_bug.cgi?id=114428

Reviewed by Jocelyn Turcotte.

Source/WebCore:

Enable default space-handling for Qt.

• page/EventHandler.cpp:

Source/WebKit/qt:

Remove our own handling of space and backspace.

• WebCoreSupport/QWebPageAdapter.cpp:

(QWebPageAdapter::handleScrolling):

• WidgetApi/qwebpage.cpp:

(QWebPagePrivate::keyPressEvent):

Source/WebKit2:

Remove our own handling of space and backspace.

• WebProcess/WebPage/qt/WebPageQt.cpp:

(WebKit::WebPage::performDefaultBehaviorForKeyEvent):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (2 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp (modified) (1 diff)
• WebKit/qt/WidgetApi/qwebpage.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-11  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] EventHandler should handle Space and BackSpace 
+        https://bugs.webkit.org/show_bug.cgi?id=114428
+
+        Reviewed by Jocelyn Turcotte.
+
+        Enable default space-handling for Qt.
+
+        * page/EventHandler.cpp:
+
 2013-04-11  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -3683 +3683 @@
 }
 
-#if PLATFORM(QT)
-// Qt handles the space event in platform-specific WebKit code.
-// Eventually it would be good to eliminate that and use the code here instead.
-void EventHandler::defaultSpaceEventHandler(KeyboardEvent*)
-{
-}
-#else
 
 void EventHandler::defaultSpaceEventHandler(KeyboardEvent* event)
@@ -3711 +3704 @@
         event->setDefaultHandled();
 }
-
-#endif
 
 void EventHandler::defaultBackspaceEventHandler(KeyboardEvent* event)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2013-04-11  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] EventHandler should handle Space and BackSpace 
+        https://bugs.webkit.org/show_bug.cgi?id=114428
+
+        Reviewed by Jocelyn Turcotte.
+
+        Remove our own handling of space and backspace.
+
+        * WebCoreSupport/QWebPageAdapter.cpp:
+        (QWebPageAdapter::handleScrolling):
+        * WidgetApi/qwebpage.cpp:
+        (QWebPagePrivate::keyPressEvent):
+
 2013-04-10  Benjamin Poulain  <bpoulain@apple.com>
 

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

@@ -1248 +1248 @@
 
 #ifndef QT_NO_SHORTCUT
-    if (ev == QKeySequence::MoveToNextPage || (ev->key() == Qt::Key_Space && !(ev->modifiers() & Qt::ShiftModifier))) {
+    if (ev == QKeySequence::MoveToNextPage) {
         granularity = WebCore::ScrollByPage;
         direction = WebCore::ScrollDown;
-    } else if (ev == QKeySequence::MoveToPreviousPage || ((ev->key() == Qt::Key_Space) && (ev->modifiers() & Qt::ShiftModifier))) {
+    } else if (ev == QKeySequence::MoveToPreviousPage) {
         granularity = WebCore::ScrollByPage;
         direction = WebCore::ScrollUp;

trunk/Source/WebKit/qt/WidgetApi/qwebpage.cpp

@@ -835 +835 @@
     bool handled = handleKeyEvent(ev);
 
+    if (!handled)
+        handled = handleScrolling(ev);
+
     if (!handled) {
         handled = true;
-        if (!handleScrolling(ev)) {
-            switch (ev->key()) {
-            case Qt::Key_Back:
-                q->triggerAction(QWebPage::Back);
-                break;
-            case Qt::Key_Forward:
-                q->triggerAction(QWebPage::Forward);
-                break;
-            case Qt::Key_Stop:
-                q->triggerAction(QWebPage::Stop);
-                break;
-            case Qt::Key_Refresh:
-                q->triggerAction(QWebPage::Reload);
-                break;
-            case Qt::Key_Backspace:
-                if (ev->modifiers() == Qt::ShiftModifier)
-                    q->triggerAction(QWebPage::Forward);
-                else
-                    q->triggerAction(QWebPage::Back);
-                break;
-            default:
-                handled = false;
-                break;
-            }
+        switch (ev->key()) {
+        case Qt::Key_Back:
+            q->triggerAction(QWebPage::Back);
+            break;
+        case Qt::Key_Forward:
+            q->triggerAction(QWebPage::Forward);
+            break;
+        case Qt::Key_Stop:
+            q->triggerAction(QWebPage::Stop);
+            break;
+        case Qt::Key_Refresh:
+            q->triggerAction(QWebPage::Reload);
+            break;
+        default:
+            handled = false;
+            break;
         }
     }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-11  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] EventHandler should handle Space and BackSpace 
+        https://bugs.webkit.org/show_bug.cgi?id=114428
+
+        Reviewed by Jocelyn Turcotte.
+
+        Remove our own handling of space and backspace.
+
+        * WebProcess/WebPage/qt/WebPageQt.cpp:
+        (WebKit::WebPage::performDefaultBehaviorForKeyEvent):
+
 2013-04-11  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp

@@ -237 +237 @@
 
     switch (keyboardEvent.windowsVirtualKeyCode()) {
-    case VK_BACK:
-        if (keyboardEvent.shiftKey())
-            m_page->goForward();
-        else
-            m_page->goBack();
-        break;
-    case VK_SPACE:
-        logicalScroll(m_page.get(), keyboardEvent.shiftKey() ? ScrollBlockDirectionBackward : ScrollBlockDirectionForward, ScrollByPage);
-        break;
     case VK_LEFT:
         scroll(m_page.get(), ScrollLeft, ScrollByLine);