diff options
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/SConscript | 3 | ||||
| -rw-r--r-- | webkit/tools/test_shell/keyboard_unittest.cc | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index d8a1c9e..8ff5fcd 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -153,6 +153,7 @@ if env['PLATFORM'] == 'win32': test_files = [ 'image_decoder_unittest.cc', + 'keyboard_unittest.cc', 'run_all_tests.cc', 'layout_test_controller_unittest.cc', '$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc', @@ -168,10 +169,8 @@ test_files = [ if env['PLATFORM'] == 'win32': # TODO(port): put portable files in above test_files declaration. test_files.extend([ - 'keyboard_unittest.cc', 'node_leak_test.cc', 'plugin_tests.cc', - 'run_all_tests.cc', 'test_shell_test.cc', 'text_input_controller_unittest.cc', '$WEBKIT_DIR/glue/bookmarklet_unittest.cc', diff --git a/webkit/tools/test_shell/keyboard_unittest.cc b/webkit/tools/test_shell/keyboard_unittest.cc index dd540f8..8ed5e3c 100644 --- a/webkit/tools/test_shell/keyboard_unittest.cc +++ b/webkit/tools/test_shell/keyboard_unittest.cc @@ -4,11 +4,14 @@ #include "config.h" -#pragma warning(push, 0) +#include "base/compiler_specific.h" + +MSVC_PUSH_WARNING_LEVEL(0); #include "EventNames.h" #include "EventTarget.h" +#include "KeyboardCodes.h" #include "KeyboardEvent.h" -#pragma warning(pop) +MSVC_POP_WARNING(); #include "webkit/glue/editor_client_impl.h" #include "webkit/glue/event_conversion.h" @@ -76,7 +79,7 @@ TEST(KeyboardUnitTestKeyDown, TestCtrlV) { TEST(KeyboardUnitTestKeyDown, TestEscape) { WebKeyboardEvent keyboard_event; - SetupKeyDownEvent(keyboard_event, VK_ESCAPE, no_modifiers); + SetupKeyDownEvent(keyboard_event, WebCore::VKEY_ESCAPE, no_modifiers); const char* result = InterpretKeyEvent(keyboard_event, PlatformKeyboardEvent::RawKeyDown); |