[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
tkent at chromium.org
tkent at chromium.org
Thu Apr 8 00:56:41 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit bad6eae036168a1c380fb84450512ee7e1fec1e5
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 7 06:12:53 2010 +0000
2010-01-06 Kinuko Yasuda <kinuko at chromium.org>
Reviewed by Eric Seidel.
Remove fast/events/keydown-numpad-key.html from the Skipped list.
https://bugs.webkit.org/show_bug.cgi?id=33250
* platform/qt/Skipped:
2010-01-06 Kinuko Yasuda <kinuko at chromium.org>
Reviewed by Eric Seidel.
Make windowsKeyCodeForKeyEvent() return correct key code for
numeric-pad arrow keys.
https://bugs.webkit.org/show_bug.cgi?id=33250
Test: fast/events/keydown-numpad-keys.html
* platform/qt/PlatformKeyboardEventQt.cpp:
(WebCore::windowsKeyCodeForKeyEvent):
2010-01-06 Kinuko Yasuda <kinuko at chromium.org>
Reviewed by Eric Seidel.
[Qt] Support the 3rd argument of EventSender.keyDown that
has been recently added to report keyLocation
(see also: https://bugs.webkit.org/show_bug.cgi?id=28247).
https://bugs.webkit.org/show_bug.cgi?id=33250
Test: fast/events/keydown-numpad-keys.html
* DumpRenderTree/qt/EventSenderQt.cpp:
(EventSender::keyDown):
* DumpRenderTree/qt/EventSenderQt.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52902 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 21b6c4b..470c395 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-06 Kinuko Yasuda <kinuko at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ Remove fast/events/keydown-numpad-key.html from the Skipped list.
+ https://bugs.webkit.org/show_bug.cgi?id=33250
+
+ * platform/qt/Skipped:
+
2010-01-06 Diego Gonzalez <diego.gonzalez at openbossa.org>
Reviewed by Kenneth Christiansen.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 7bb7c33..1c445da 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -442,7 +442,6 @@ fast/events/drag-in-frames.html
fast/events/focusingUnloadedFrame.html
fast/events/js-keyboard-event-creation.html
fast/events/keydown-1.html
-fast/events/keydown-numpad-keys.html
fast/events/keypress-insert-tab.html
fast/events/mouseout-dead-node.html
fast/events/ondragenter.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bd5fe2a..e739293 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-06 Kinuko Yasuda <kinuko at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ Make windowsKeyCodeForKeyEvent() return correct key code for
+ numeric-pad arrow keys.
+ https://bugs.webkit.org/show_bug.cgi?id=33250
+
+ Test: fast/events/keydown-numpad-keys.html
+
+ * platform/qt/PlatformKeyboardEventQt.cpp:
+ (WebCore::windowsKeyCodeForKeyEvent):
+
2009-10-18 Patrick Gansterer <paroga at paroga.com>
Reviewed by Dirk Schulze.
diff --git a/WebCore/platform/qt/PlatformKeyboardEventQt.cpp b/WebCore/platform/qt/PlatformKeyboardEventQt.cpp
index f78c7d7..12200f4 100644
--- a/WebCore/platform/qt/PlatformKeyboardEventQt.cpp
+++ b/WebCore/platform/qt/PlatformKeyboardEventQt.cpp
@@ -171,6 +171,22 @@ static int windowsKeyCodeForKeyEvent(unsigned int keycode, bool isKeypad = false
return VK_DECIMAL; // (6E) Decimal key
case Qt::Key_Slash:
return VK_DIVIDE; // (6F) Divide key
+ case Qt::Key_PageUp:
+ return VK_PRIOR; // (21) PAGE UP key
+ case Qt::Key_PageDown:
+ return VK_NEXT; // (22) PAGE DOWN key
+ case Qt::Key_End:
+ return VK_END; // (23) END key
+ case Qt::Key_Home:
+ return VK_HOME; // (24) HOME key
+ case Qt::Key_Left:
+ return VK_LEFT; // (25) LEFT ARROW key
+ case Qt::Key_Up:
+ return VK_UP; // (26) UP ARROW key
+ case Qt::Key_Right:
+ return VK_RIGHT; // (27) RIGHT ARROW key
+ case Qt::Key_Down:
+ return VK_DOWN; // (28) DOWN ARROW key
default:
return 0;
}
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d7adbaf..898fbc0 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-01-06 Kinuko Yasuda <kinuko at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ [Qt] Support the 3rd argument of EventSender.keyDown that
+ has been recently added to report keyLocation
+ (see also: https://bugs.webkit.org/show_bug.cgi?id=28247).
+ https://bugs.webkit.org/show_bug.cgi?id=33250
+
+ Test: fast/events/keydown-numpad-keys.html
+
+ * DumpRenderTree/qt/EventSenderQt.cpp:
+ (EventSender::keyDown):
+ * DumpRenderTree/qt/EventSenderQt.h:
+
2010-01-06 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
index 22b8ff3..cbc7953 100644
--- a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
@@ -142,7 +142,7 @@ void EventSender::leapForward(int ms)
//qDebug() << "EventSender::leapForward" << ms;
}
-void EventSender::keyDown(const QString& string, const QStringList& modifiers)
+void EventSender::keyDown(const QString& string, const QStringList& modifiers, unsigned int location)
{
QString s = string;
Qt::KeyboardModifiers modifs = 0;
@@ -157,6 +157,8 @@ void EventSender::keyDown(const QString& string, const QStringList& modifiers)
else if (m == "metaKey")
modifs |= Qt::MetaModifier;
}
+ if (location == 3)
+ modifs |= Qt::KeypadModifier;
int code = 0;
if (string.length() == 1) {
code = string.unicode()->unicode();
diff --git a/WebKitTools/DumpRenderTree/qt/EventSenderQt.h b/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
index ab51912..c17732f 100644
--- a/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
+++ b/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
@@ -56,7 +56,7 @@ public slots:
void mouseUp(int button = 0);
void mouseMoveTo(int x, int y);
void leapForward(int ms);
- void keyDown(const QString& string, const QStringList& modifiers = QStringList());
+ void keyDown(const QString& string, const QStringList& modifiers = QStringList(), unsigned int location = 0);
void clearKillRing() {}
void contextClick();
void scheduleAsynchronousClick();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list