Title: [148195] trunk/Source
- Revision
- 148195
- Author
- [email protected]
- Date
- 2013-04-11 04:46:18 -0700 (Thu, 11 Apr 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (148194 => 148195)
--- trunk/Source/WebCore/ChangeLog 2013-04-11 11:37:53 UTC (rev 148194)
+++ trunk/Source/WebCore/ChangeLog 2013-04-11 11:46:18 UTC (rev 148195)
@@ -1,3 +1,14 @@
+2013-04-11 Allan Sandfeld Jensen <[email protected]>
+
+ [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 <[email protected]>
IconDatabase: Simplify boolean logic in assertion.
Modified: trunk/Source/WebCore/page/EventHandler.cpp (148194 => 148195)
--- trunk/Source/WebCore/page/EventHandler.cpp 2013-04-11 11:37:53 UTC (rev 148194)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2013-04-11 11:46:18 UTC (rev 148195)
@@ -3682,13 +3682,6 @@
event->setDefaultHandled();
}
-#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,8 +3704,6 @@
event->setDefaultHandled();
}
-#endif
-
void EventHandler::defaultBackspaceEventHandler(KeyboardEvent* event)
{
ASSERT(event->type() == eventNames().keydownEvent);
Modified: trunk/Source/WebKit/qt/ChangeLog (148194 => 148195)
--- trunk/Source/WebKit/qt/ChangeLog 2013-04-11 11:37:53 UTC (rev 148194)
+++ trunk/Source/WebKit/qt/ChangeLog 2013-04-11 11:46:18 UTC (rev 148195)
@@ -1,3 +1,17 @@
+2013-04-11 Allan Sandfeld Jensen <[email protected]>
+
+ [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 <[email protected]>
Mass remove all the empty directories
Modified: trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp (148194 => 148195)
--- trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2013-04-11 11:37:53 UTC (rev 148194)
+++ trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2013-04-11 11:46:18 UTC (rev 148195)
@@ -1247,10 +1247,10 @@
WebCore::ScrollGranularity granularity;
#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;
} else
Modified: trunk/Source/WebKit/qt/WidgetApi/qwebpage.cpp (148194 => 148195)
--- trunk/Source/WebKit/qt/WidgetApi/qwebpage.cpp 2013-04-11 11:37:53 UTC (rev 148194)
+++ trunk/Source/WebKit/qt/WidgetApi/qwebpage.cpp 2013-04-11 11:46:18 UTC (rev 148195)
@@ -834,32 +834,27 @@
// to trigger editor commands via triggerAction().
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;
}
}
Modified: trunk/Source/WebKit2/ChangeLog (148194 => 148195)
--- trunk/Source/WebKit2/ChangeLog 2013-04-11 11:37:53 UTC (rev 148194)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-11 11:46:18 UTC (rev 148195)
@@ -1,3 +1,15 @@
+2013-04-11 Allan Sandfeld Jensen <[email protected]>
+
+ [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 <[email protected]>
Unreviewed Qt buildfixes after r148147, r148148 and r148154.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp (148194 => 148195)
--- trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp 2013-04-11 11:37:53 UTC (rev 148194)
+++ trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp 2013-04-11 11:46:18 UTC (rev 148195)
@@ -236,15 +236,6 @@
return false;
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);
break;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
