summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--content/renderer/render_view_browsertest.cc22
-rw-r--r--content/test/render_view_test.cc154
-rw-r--r--content/test/render_view_test.h3
-rw-r--r--ui/base/keycodes/keyboard_code_conversion_x.cc21
4 files changed, 175 insertions, 25 deletions
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 050662e..d23cc55 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -521,16 +521,9 @@ TEST_F(RenderViewImplTest, OnSetTextDirection) {
}
}
-#if defined(USE_AURA)
-// crbug.com/103499.
-#define MAYBE_OnHandleKeyboardEvent DISABLED_OnHandleKeyboardEvent
-#else
-#define MAYBE_OnHandleKeyboardEvent OnHandleKeyboardEvent
-#endif
-
// Test that we can receive correct DOM events when we send input events
// through the RenderWidget::OnHandleInputEvent() function.
-TEST_F(RenderViewImplTest, MAYBE_OnHandleKeyboardEvent) {
+TEST_F(RenderViewImplTest, OnHandleKeyboardEvent) {
#if !defined(OS_MACOSX)
// Load an HTML page consisting of one <input> element and three
// contentediable <div> elements.
@@ -638,7 +631,7 @@ TEST_F(RenderViewImplTest, MAYBE_OnHandleKeyboardEvent) {
// driver is installed in a PC and the driver can assign a Unicode
// charcter for the given tuple (key-code and modifiers).
int key_code = kKeyCodes[k];
- std::wstring char_code;
+ string16 char_code;
if (SendKeyEvent(layout, key_code, modifiers, &char_code) < 0)
continue;
@@ -674,18 +667,11 @@ TEST_F(RenderViewImplTest, MAYBE_OnHandleKeyboardEvent) {
#endif
}
-#if defined(USE_AURA)
-// crbug.com/103499.
-#define MAYBE_InsertCharacters DISABLED_InsertCharacters
-#else
-#define MAYBE_InsertCharacters InsertCharacters
-#endif
-
// Test that our EditorClientImpl class can insert characters when we send
// keyboard events through the RenderWidget::OnHandleInputEvent() function.
// This test is for preventing regressions caused only when we use non-US
// keyboards, such as Issue 10846.
-TEST_F(RenderViewImplTest, MAYBE_InsertCharacters) {
+TEST_F(RenderViewImplTest, InsertCharacters) {
#if !defined(OS_MACOSX)
static const struct {
MockKeyboard::Layout layout;
@@ -886,7 +872,7 @@ TEST_F(RenderViewImplTest, MAYBE_InsertCharacters) {
// driver is installed in a PC and the driver can assign a Unicode
// charcter for the given tuple (layout, key-code, and modifiers).
int key_code = kKeyCodes[k];
- std::wstring char_code;
+ string16 char_code;
if (SendKeyEvent(layout, key_code, modifiers, &char_code) < 0)
continue;
}
diff --git a/content/test/render_view_test.cc b/content/test/render_view_test.cc
index 5d60fc5..154dd4c 100644
--- a/content/test/render_view_test.cc
+++ b/content/test/render_view_test.cc
@@ -24,6 +24,19 @@
#include "ui/base/gtk/event_synthesis_gtk.h"
#endif
+#if defined(USE_AURA)
+#include "ui/aura/event.h"
+#endif
+
+#if defined(USE_AURA) && defined(USE_X11)
+#include <X11/Xlib.h>
+#include <X11/keysym.h>
+#include "ui/base/events.h"
+#include "ui/base/keycodes/keyboard_code_conversion.h"
+#include "ui/base/keycodes/keyboard_code_conversion_x.h"
+#include "ui/base/x/x11_util.h"
+#endif
+
using WebKit::WebFrame;
using WebKit::WebInputEvent;
using WebKit::WebMouseEvent;
@@ -35,6 +48,89 @@ using WebKit::WebURLRequest;
namespace {
const int32 kOpenerId = 7;
const int32 kRouteId = 5;
+
+#if defined(USE_AURA) && defined(USE_X11)
+// Converts ui::EventType to XKeyEvent state.
+unsigned int XKeyEventState(int flags) {
+ return
+ ((flags & ui::EF_SHIFT_DOWN) ? ShiftMask : 0) |
+ ((flags & ui::EF_CONTROL_DOWN) ? ControlMask : 0) |
+ ((flags & ui::EF_CAPS_LOCK_DOWN) ? LockMask : 0);
+}
+
+// Converts ui::EventType to XKeyEvent type.
+int XKeyEventType(ui::EventType type) {
+ switch (type) {
+ case ui::ET_KEY_PRESSED:
+ return KeyPress;
+ case ui::ET_KEY_RELEASED:
+ return KeyRelease;
+ default:
+ return 0;
+ }
+}
+
+// Converts ui::KeyboardCode to XKeyEvent keycode.
+unsigned int XKeyEventKeyCode(ui::KeyboardCode key_code,
+ int flags,
+ Display* display) {
+ const int keysym = ui::XKeysymForWindowsKeyCode(key_code,
+ flags & ui::EF_SHIFT_DOWN);
+ // The test assumes the keycode for XK_less is equal to the one of XK_comma,
+ // but XKeysymToKeycode returns 94 for XK_less while it returns 59 for
+ // XK_comma. Here we convert the value for XK_less to the value for XK_comma.
+ return (keysym == XK_less) ? 59 : XKeysymToKeycode(display, keysym);
+}
+
+// Creates a fake XEvent for testing.
+XEvent* CreateFakeXEvent(ui::EventType type,
+ ui::KeyboardCode key_code,
+ int flags) {
+ Display* display = ui::GetXDisplay();
+ XKeyEvent key_event;
+ key_event.type = XKeyEventType(type);
+ key_event.serial = 0;
+ key_event.send_event = 0;
+ key_event.display = display;
+ key_event.time = 0;
+ key_event.window = 0;
+ key_event.root = 0;
+ key_event.subwindow = 0;
+ key_event.x = 0;
+ key_event.y = 0;
+ key_event.x_root = 0;
+ key_event.y_root = 0;
+ key_event.state = XKeyEventState(flags);
+ key_event.keycode = XKeyEventKeyCode(key_code, flags, display);
+ key_event.same_screen = 1;
+ XEvent* event = new XEvent;
+ event->type = key_event.type;
+ event->xkey = key_event;
+ return event;
+}
+
+// Converts MockKeyboard::Modifiers to ui::EventFlags.
+int ConvertMockKeyboardModifier(MockKeyboard::Modifiers modifiers) {
+ static struct ModifierMap {
+ MockKeyboard::Modifiers src;
+ int dst;
+ } kModifierMap[] = {
+ { MockKeyboard::LEFT_SHIFT, ui::EF_SHIFT_DOWN },
+ { MockKeyboard::RIGHT_SHIFT, ui::EF_SHIFT_DOWN },
+ { MockKeyboard::LEFT_CONTROL, ui::EF_CONTROL_DOWN },
+ { MockKeyboard::RIGHT_CONTROL, ui::EF_CONTROL_DOWN },
+ { MockKeyboard::LEFT_ALT, ui::EF_ALT_DOWN },
+ { MockKeyboard::RIGHT_ALT, ui::EF_ALT_DOWN },
+ };
+ int flags = 0;
+ for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kModifierMap); ++i) {
+ if (kModifierMap[i].src & modifiers) {
+ flags |= kModifierMap[i].dst;
+ }
+ }
+ return flags;
+}
+#endif
} // namespace
namespace content {
@@ -157,11 +253,8 @@ void RenderViewTest::TearDown() {
int RenderViewTest::SendKeyEvent(MockKeyboard::Layout layout,
int key_code,
MockKeyboard::Modifiers modifiers,
- std::wstring* output) {
-#if defined(USE_AURA)
- NOTIMPLEMENTED();
- return L'\0';
-#elif defined(OS_WIN)
+ string16* output) {
+#if defined(OS_WIN)
// Retrieve the Unicode character for the given tuple (keyboard-layout,
// key-code, and modifiers).
// Exit when a keyboard-layout driver cannot assign a Unicode character to
@@ -180,18 +273,67 @@ int RenderViewTest::SendKeyEvent(MockKeyboard::Layout layout,
// WM_KEYDOWN and WM_KEYUP sends virtual-key codes. On the other hand,
// WM_CHAR sends a composed Unicode character.
MSG msg1 = { NULL, WM_KEYDOWN, key_code, 0 };
+#if defined(USE_AURA)
+ aura::KeyEvent evt1(msg1, false);
+ NativeWebKeyboardEvent keydown_event(&evt1);
+#else
NativeWebKeyboardEvent keydown_event(msg1);
+#endif
SendNativeKeyEvent(keydown_event);
MSG msg2 = { NULL, WM_CHAR, (*output)[0], 0 };
+#if defined(USE_AURA)
+ aura::KeyEvent evt2(msg2, true);
+ NativeWebKeyboardEvent char_event(&evt2);
+#else
NativeWebKeyboardEvent char_event(msg2);
+#endif
SendNativeKeyEvent(char_event);
MSG msg3 = { NULL, WM_KEYUP, key_code, 0 };
+#if defined(USE_AURA)
+ aura::KeyEvent evt3(msg3, false);
+ NativeWebKeyboardEvent keyup_event(&evt3);
+#else
NativeWebKeyboardEvent keyup_event(msg3);
+#endif
SendNativeKeyEvent(keyup_event);
return length;
+#elif defined(USE_AURA) && defined(USE_X11)
+ // We ignore |layout|, which means we are only testing the layout of the
+ // current locale. TODO(mazda): fix this to respect |layout|.
+ CHECK(output);
+ const int flags = ConvertMockKeyboardModifier(modifiers);
+
+ scoped_ptr<XEvent> xevent1(CreateFakeXEvent(
+ ui::ET_KEY_PRESSED,
+ static_cast<ui::KeyboardCode>(key_code),
+ flags));
+ aura::KeyEvent event1(xevent1.get(), false);
+ NativeWebKeyboardEvent keydown_event(&event1);
+ SendNativeKeyEvent(keydown_event);
+
+ scoped_ptr<XEvent> xevent2(CreateFakeXEvent(
+ ui::ET_KEY_PRESSED,
+ static_cast<ui::KeyboardCode>(key_code),
+ flags));
+ aura::KeyEvent event2(xevent2.get(), true);
+ NativeWebKeyboardEvent char_event(&event2);
+ SendNativeKeyEvent(char_event);
+
+ scoped_ptr<XEvent> xevent3(CreateFakeXEvent(
+ ui::ET_KEY_RELEASED,
+ static_cast<ui::KeyboardCode>(key_code),
+ flags));
+ aura::KeyEvent event3(xevent3.get(), false);
+ NativeWebKeyboardEvent keyup_event(&event3);
+ SendNativeKeyEvent(keyup_event);
+
+ long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
+ flags);
+ output->assign(1, static_cast<char16>(c));
+ return 1;
#elif defined(OS_LINUX)
// We ignore |layout|, which means we are only testing the layout of the
// current locale. TODO(estade): fix this to respect |layout|.
@@ -223,7 +365,7 @@ int RenderViewTest::SendKeyEvent(MockKeyboard::Layout layout,
gdk_event_free(events[i]);
}
- *output = std::wstring(1, unicode_key);
+ output->assign(1, static_cast<char16>(unicode_key));
return 1;
#else
NOTIMPLEMENTED();
diff --git a/content/test/render_view_test.h b/content/test/render_view_test.h
index d3878db7..6c4c495 100644
--- a/content/test/render_view_test.h
+++ b/content/test/render_view_test.h
@@ -11,6 +11,7 @@
#include "base/command_line.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
+#include "base/string16.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/common/main_function_params.h"
#include "content/renderer/mock_content_renderer_client.h"
@@ -76,7 +77,7 @@ class RenderViewTest : public testing::Test {
int SendKeyEvent(MockKeyboard::Layout layout,
int key_code,
MockKeyboard::Modifiers key_modifiers,
- std::wstring* output);
+ string16* output);
// Sends one native key event over IPC.
void SendNativeKeyEvent(const NativeWebKeyboardEvent& key_event);
diff --git a/ui/base/keycodes/keyboard_code_conversion_x.cc b/ui/base/keycodes/keyboard_code_conversion_x.cc
index d9eaa9f..eda35b4 100644
--- a/ui/base/keycodes/keyboard_code_conversion_x.cc
+++ b/ui/base/keycodes/keyboard_code_conversion_x.cc
@@ -170,6 +170,27 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
case XK_9:
return static_cast<KeyboardCode>(VKEY_0 + (keysym - XK_0));
+ case XK_parenright:
+ return VKEY_0;
+ case XK_exclam:
+ return VKEY_1;
+ case XK_at:
+ return VKEY_2;
+ case XK_numbersign:
+ return VKEY_3;
+ case XK_dollar:
+ return VKEY_4;
+ case XK_percent:
+ return VKEY_5;
+ case XK_asciicircum:
+ return VKEY_6;
+ case XK_ampersand:
+ return VKEY_7;
+ case XK_asterisk:
+ return VKEY_8;
+ case XK_parenleft:
+ return VKEY_9;
+
case XK_KP_0:
case XK_KP_1:
case XK_KP_2:
generated by cgit v1.1 at 2025-01-29 19:56:29 +0000